diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:39 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-17 12:20:39 +0000 |
commit | 1376c5a617be5c25655d0d7cb63e3beaa5a6e026 (patch) | |
tree | 3bb8d61aee02bc7a15eab3f36e3b921afc2075d0 /tests/run-make/doctests-keep-binaries | |
parent | Releasing progress-linux version 1.69.0+dfsg1-1~progress7.99u1. (diff) | |
download | rustc-1376c5a617be5c25655d0d7cb63e3beaa5a6e026.tar.xz rustc-1376c5a617be5c25655d0d7cb63e3beaa5a6e026.zip |
Merging upstream version 1.70.0+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | tests/run-make/doctests-keep-binaries/Makefile (renamed from tests/run-make-fulldeps/doctests-keep-binaries/Makefile) | 3 | ||||
-rw-r--r-- | tests/run-make/doctests-keep-binaries/t.rs (renamed from tests/run-make-fulldeps/doctests-keep-binaries/t.rs) | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tests/run-make-fulldeps/doctests-keep-binaries/Makefile b/tests/run-make/doctests-keep-binaries/Makefile index 273c8980b..6254e93d3 100644 --- a/tests/run-make-fulldeps/doctests-keep-binaries/Makefile +++ b/tests/run-make/doctests-keep-binaries/Makefile @@ -1,4 +1,5 @@ -include ../../run-make-fulldeps/tools.mk +# ignore-cross-compile +include ../tools.mk # Check that valid binaries are persisted by running them, regardless of whether the --run or --no-run option is used. diff --git a/tests/run-make-fulldeps/doctests-keep-binaries/t.rs b/tests/run-make/doctests-keep-binaries/t.rs index c38cf0a0b..c38cf0a0b 100644 --- a/tests/run-make-fulldeps/doctests-keep-binaries/t.rs +++ b/tests/run-make/doctests-keep-binaries/t.rs |