summaryrefslogtreecommitdiffstats
path: root/tests/run-make/archive-duplicate-names
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:39 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:20:39 +0000
commit1376c5a617be5c25655d0d7cb63e3beaa5a6e026 (patch)
tree3bb8d61aee02bc7a15eab3f36e3b921afc2075d0 /tests/run-make/archive-duplicate-names
parentReleasing progress-linux version 1.69.0+dfsg1-1~progress7.99u1. (diff)
downloadrustc-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/archive-duplicate-names/Makefile (renamed from tests/run-make-fulldeps/archive-duplicate-names/Makefile)1
-rw-r--r--tests/run-make/archive-duplicate-names/bar.c (renamed from tests/run-make-fulldeps/archive-duplicate-names/bar.c)0
-rw-r--r--tests/run-make/archive-duplicate-names/bar.rs (renamed from tests/run-make-fulldeps/archive-duplicate-names/bar.rs)0
-rw-r--r--tests/run-make/archive-duplicate-names/foo.c (renamed from tests/run-make-fulldeps/archive-duplicate-names/foo.c)0
-rw-r--r--tests/run-make/archive-duplicate-names/foo.rs (renamed from tests/run-make-fulldeps/archive-duplicate-names/foo.rs)0
5 files changed, 1 insertions, 0 deletions
diff --git a/tests/run-make-fulldeps/archive-duplicate-names/Makefile b/tests/run-make/archive-duplicate-names/Makefile
index bbdcd2a34..5433a42d2 100644
--- a/tests/run-make-fulldeps/archive-duplicate-names/Makefile
+++ b/tests/run-make/archive-duplicate-names/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
include ../tools.mk
all:
diff --git a/tests/run-make-fulldeps/archive-duplicate-names/bar.c b/tests/run-make/archive-duplicate-names/bar.c
index e42599986..e42599986 100644
--- a/tests/run-make-fulldeps/archive-duplicate-names/bar.c
+++ b/tests/run-make/archive-duplicate-names/bar.c
diff --git a/tests/run-make-fulldeps/archive-duplicate-names/bar.rs b/tests/run-make/archive-duplicate-names/bar.rs
index 994a98c2c..994a98c2c 100644
--- a/tests/run-make-fulldeps/archive-duplicate-names/bar.rs
+++ b/tests/run-make/archive-duplicate-names/bar.rs
diff --git a/tests/run-make-fulldeps/archive-duplicate-names/foo.c b/tests/run-make/archive-duplicate-names/foo.c
index 85e6cd8c3..85e6cd8c3 100644
--- a/tests/run-make-fulldeps/archive-duplicate-names/foo.c
+++ b/tests/run-make/archive-duplicate-names/foo.c
diff --git a/tests/run-make-fulldeps/archive-duplicate-names/foo.rs b/tests/run-make/archive-duplicate-names/foo.rs
index 0bf13c406..0bf13c406 100644
--- a/tests/run-make-fulldeps/archive-duplicate-names/foo.rs
+++ b/tests/run-make/archive-duplicate-names/foo.rs