diff --git a/tests/run-make-fulldeps/hotplug_codegen_backend/Makefile b/tests/run-make-fulldeps/hotplug_codegen_backend/Makefile index 4cda243ffb5a3..6752091e699ff 100644 --- a/tests/run-make-fulldeps/hotplug_codegen_backend/Makefile +++ b/tests/run-make-fulldeps/hotplug_codegen_backend/Makefile @@ -1,4 +1,4 @@ -include ../tools.mk +include ../../run-make/tools.mk # ignore-stage1 diff --git a/tests/run-make-fulldeps/issue-19371/Makefile b/tests/run-make-fulldeps/issue-19371/Makefile index 994e50801c817..edec68f086232 100644 --- a/tests/run-make-fulldeps/issue-19371/Makefile +++ b/tests/run-make-fulldeps/issue-19371/Makefile @@ -1,4 +1,4 @@ -include ../tools.mk +include ../../run-make/tools.mk # This test ensures that rustc compile_input can be called twice in one task # without causing a panic. diff --git a/tests/run-make-fulldeps/issue-25581/Makefile b/tests/run-make-fulldeps/issue-25581/Makefile deleted file mode 100644 index 4f5d026f213f2..0000000000000 --- a/tests/run-make-fulldeps/issue-25581/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -include ../tools.mk - -all: $(call NATIVE_STATICLIB,test) - $(RUSTC) test.rs - $(call RUN,test) || exit 1 diff --git a/tests/run-make-fulldeps/obtain-borrowck/Makefile b/tests/run-make-fulldeps/obtain-borrowck/Makefile index 212d0f67d0063..233f5c9eaf499 100644 --- a/tests/run-make-fulldeps/obtain-borrowck/Makefile +++ b/tests/run-make-fulldeps/obtain-borrowck/Makefile @@ -1,4 +1,4 @@ -include ../tools.mk +include ../../run-make/tools.mk # This example shows how to implement a rustc driver that retrieves MIR bodies # together with the borrow checker information. diff --git a/tests/run-make-fulldeps/pretty-expanded/Makefile b/tests/run-make-fulldeps/pretty-expanded/Makefile index 5a0097a83511f..48199179ecef9 100644 --- a/tests/run-make-fulldeps/pretty-expanded/Makefile +++ b/tests/run-make-fulldeps/pretty-expanded/Makefile @@ -1,4 +1,4 @@ -include ../tools.mk +include ../../run-make/tools.mk all: $(RUSTC) -o $(TMPDIR)/input.expanded.rs -Zunpretty=expanded input.rs diff --git a/tests/run-make-fulldeps/a-b-a-linker-guard/Makefile b/tests/run-make/a-b-a-linker-guard/Makefile similarity index 96% rename from tests/run-make-fulldeps/a-b-a-linker-guard/Makefile rename to tests/run-make/a-b-a-linker-guard/Makefile index adc9e3d091609..43282eae09c59 100644 --- a/tests/run-make-fulldeps/a-b-a-linker-guard/Makefile +++ b/tests/run-make/a-b-a-linker-guard/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Test that if we build `b` against a version of `a` that has one set diff --git a/tests/run-make-fulldeps/a-b-a-linker-guard/a.rs b/tests/run-make/a-b-a-linker-guard/a.rs similarity index 100% rename from tests/run-make-fulldeps/a-b-a-linker-guard/a.rs rename to tests/run-make/a-b-a-linker-guard/a.rs diff --git a/tests/run-make-fulldeps/a-b-a-linker-guard/b.rs b/tests/run-make/a-b-a-linker-guard/b.rs similarity index 100% rename from tests/run-make-fulldeps/a-b-a-linker-guard/b.rs rename to tests/run-make/a-b-a-linker-guard/b.rs diff --git a/tests/run-make-fulldeps/alloc-no-oom-handling/Makefile b/tests/run-make/alloc-no-oom-handling/Makefile similarity index 100% rename from tests/run-make-fulldeps/alloc-no-oom-handling/Makefile rename to tests/run-make/alloc-no-oom-handling/Makefile diff --git a/tests/run-make-fulldeps/alloc-no-rc/Makefile b/tests/run-make/alloc-no-rc/Makefile similarity index 100% rename from tests/run-make-fulldeps/alloc-no-rc/Makefile rename to tests/run-make/alloc-no-rc/Makefile diff --git a/tests/run-make-fulldeps/alloc-no-sync/Makefile b/tests/run-make/alloc-no-sync/Makefile similarity index 100% rename from tests/run-make-fulldeps/alloc-no-sync/Makefile rename to tests/run-make/alloc-no-sync/Makefile diff --git a/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile b/tests/run-make/allow-non-lint-warnings-cmdline/Makefile similarity index 92% rename from tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile rename to tests/run-make/allow-non-lint-warnings-cmdline/Makefile index 60d9c7c374590..78b9a7b989895 100644 --- a/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile +++ b/tests/run-make/allow-non-lint-warnings-cmdline/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Test that -A warnings makes the 'empty trait list for derive' warning go away diff --git a/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs b/tests/run-make/allow-non-lint-warnings-cmdline/foo.rs similarity index 100% rename from tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs rename to tests/run-make/allow-non-lint-warnings-cmdline/foo.rs diff --git a/tests/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile b/tests/run-make/allow-warnings-cmdline-stability/Makefile similarity index 93% rename from tests/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile rename to tests/run-make/allow-warnings-cmdline-stability/Makefile index 1ce8d0ec28417..368a39af6bfe2 100644 --- a/tests/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile +++ b/tests/run-make/allow-warnings-cmdline-stability/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Test that -A warnings makes the 'empty trait list for derive' warning go away diff --git a/tests/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs b/tests/run-make/allow-warnings-cmdline-stability/bar.rs similarity index 100% rename from tests/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs rename to tests/run-make/allow-warnings-cmdline-stability/bar.rs diff --git a/tests/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs b/tests/run-make/allow-warnings-cmdline-stability/foo.rs similarity index 100% rename from tests/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs rename to tests/run-make/allow-warnings-cmdline-stability/foo.rs diff --git a/tests/run-make-fulldeps/archive-duplicate-names/Makefile b/tests/run-make/archive-duplicate-names/Makefile similarity index 92% rename from tests/run-make-fulldeps/archive-duplicate-names/Makefile rename to tests/run-make/archive-duplicate-names/Makefile index bbdcd2a34fe04..5433a42d25286 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 similarity index 100% rename from tests/run-make-fulldeps/archive-duplicate-names/bar.c rename to 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 similarity index 100% rename from tests/run-make-fulldeps/archive-duplicate-names/bar.rs rename to 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 similarity index 100% rename from tests/run-make-fulldeps/archive-duplicate-names/foo.c rename to 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 similarity index 100% rename from tests/run-make-fulldeps/archive-duplicate-names/foo.rs rename to tests/run-make/archive-duplicate-names/foo.rs diff --git a/tests/run-make-fulldeps/arguments-non-c-like-enum/Makefile b/tests/run-make/arguments-non-c-like-enum/Makefile similarity index 89% rename from tests/run-make-fulldeps/arguments-non-c-like-enum/Makefile rename to tests/run-make/arguments-non-c-like-enum/Makefile index 513311c828946..0c8d8bf3acc60 100644 --- a/tests/run-make-fulldeps/arguments-non-c-like-enum/Makefile +++ b/tests/run-make/arguments-non-c-like-enum/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs b/tests/run-make/arguments-non-c-like-enum/nonclike.rs similarity index 100% rename from tests/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs rename to tests/run-make/arguments-non-c-like-enum/nonclike.rs diff --git a/tests/run-make-fulldeps/arguments-non-c-like-enum/test.c b/tests/run-make/arguments-non-c-like-enum/test.c similarity index 100% rename from tests/run-make-fulldeps/arguments-non-c-like-enum/test.c rename to tests/run-make/arguments-non-c-like-enum/test.c diff --git a/tests/run-make-fulldeps/atomic-lock-free/Makefile b/tests/run-make/atomic-lock-free/Makefile similarity index 100% rename from tests/run-make-fulldeps/atomic-lock-free/Makefile rename to tests/run-make/atomic-lock-free/Makefile diff --git a/tests/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs b/tests/run-make/atomic-lock-free/atomic_lock_free.rs similarity index 100% rename from tests/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs rename to tests/run-make/atomic-lock-free/atomic_lock_free.rs diff --git a/tests/run-make-fulldeps/bare-outfile/Makefile b/tests/run-make/bare-outfile/Makefile similarity index 81% rename from tests/run-make-fulldeps/bare-outfile/Makefile rename to tests/run-make/bare-outfile/Makefile index 858466e942b15..23b619ea0ba32 100644 --- a/tests/run-make-fulldeps/bare-outfile/Makefile +++ b/tests/run-make/bare-outfile/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/bare-outfile/foo.rs b/tests/run-make/bare-outfile/foo.rs similarity index 100% rename from tests/run-make-fulldeps/bare-outfile/foo.rs rename to tests/run-make/bare-outfile/foo.rs diff --git a/tests/run-make-fulldeps/c-dynamic-dylib/Makefile b/tests/run-make/c-dynamic-dylib/Makefile similarity index 91% rename from tests/run-make-fulldeps/c-dynamic-dylib/Makefile rename to tests/run-make/c-dynamic-dylib/Makefile index ac68778922d6d..b5bfbc7653911 100644 --- a/tests/run-make-fulldeps/c-dynamic-dylib/Makefile +++ b/tests/run-make/c-dynamic-dylib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-macos diff --git a/tests/run-make-fulldeps/c-dynamic-dylib/bar.rs b/tests/run-make/c-dynamic-dylib/bar.rs similarity index 100% rename from tests/run-make-fulldeps/c-dynamic-dylib/bar.rs rename to tests/run-make/c-dynamic-dylib/bar.rs diff --git a/tests/run-make-fulldeps/c-dynamic-dylib/cfoo.c b/tests/run-make/c-dynamic-dylib/cfoo.c similarity index 100% rename from tests/run-make-fulldeps/c-dynamic-dylib/cfoo.c rename to tests/run-make/c-dynamic-dylib/cfoo.c diff --git a/tests/run-make-fulldeps/c-dynamic-dylib/foo.rs b/tests/run-make/c-dynamic-dylib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/c-dynamic-dylib/foo.rs rename to tests/run-make/c-dynamic-dylib/foo.rs diff --git a/tests/run-make-fulldeps/c-dynamic-rlib/Makefile b/tests/run-make/c-dynamic-rlib/Makefile similarity index 93% rename from tests/run-make-fulldeps/c-dynamic-rlib/Makefile rename to tests/run-make/c-dynamic-rlib/Makefile index c65d648b92957..0475bd8acae5a 100644 --- a/tests/run-make-fulldeps/c-dynamic-rlib/Makefile +++ b/tests/run-make/c-dynamic-rlib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-macos diff --git a/tests/run-make-fulldeps/c-dynamic-rlib/bar.rs b/tests/run-make/c-dynamic-rlib/bar.rs similarity index 100% rename from tests/run-make-fulldeps/c-dynamic-rlib/bar.rs rename to tests/run-make/c-dynamic-rlib/bar.rs diff --git a/tests/run-make-fulldeps/c-dynamic-rlib/cfoo.c b/tests/run-make/c-dynamic-rlib/cfoo.c similarity index 100% rename from tests/run-make-fulldeps/c-dynamic-rlib/cfoo.c rename to tests/run-make/c-dynamic-rlib/cfoo.c diff --git a/tests/run-make-fulldeps/c-dynamic-rlib/foo.rs b/tests/run-make/c-dynamic-rlib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/c-dynamic-rlib/foo.rs rename to tests/run-make/c-dynamic-rlib/foo.rs diff --git a/tests/run-make-fulldeps/c-link-to-rust-dylib/Makefile b/tests/run-make/c-link-to-rust-dylib/Makefile similarity index 94% rename from tests/run-make-fulldeps/c-link-to-rust-dylib/Makefile rename to tests/run-make/c-link-to-rust-dylib/Makefile index 2a371b54541e5..2763cb6ed1d73 100644 --- a/tests/run-make-fulldeps/c-link-to-rust-dylib/Makefile +++ b/tests/run-make/c-link-to-rust-dylib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(TMPDIR)/$(call BIN,bar) diff --git a/tests/run-make-fulldeps/c-link-to-rust-dylib/bar.c b/tests/run-make/c-link-to-rust-dylib/bar.c similarity index 100% rename from tests/run-make-fulldeps/c-link-to-rust-dylib/bar.c rename to tests/run-make/c-link-to-rust-dylib/bar.c diff --git a/tests/run-make-fulldeps/c-link-to-rust-dylib/foo.rs b/tests/run-make/c-link-to-rust-dylib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/c-link-to-rust-dylib/foo.rs rename to tests/run-make/c-link-to-rust-dylib/foo.rs diff --git a/tests/run-make-fulldeps/c-link-to-rust-staticlib/Makefile b/tests/run-make/c-link-to-rust-staticlib/Makefile similarity index 90% rename from tests/run-make-fulldeps/c-link-to-rust-staticlib/Makefile rename to tests/run-make/c-link-to-rust-staticlib/Makefile index d38bcef309a76..e14775f5c181c 100644 --- a/tests/run-make-fulldeps/c-link-to-rust-staticlib/Makefile +++ b/tests/run-make/c-link-to-rust-staticlib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-freebsd diff --git a/tests/run-make-fulldeps/c-link-to-rust-staticlib/bar.c b/tests/run-make/c-link-to-rust-staticlib/bar.c similarity index 100% rename from tests/run-make-fulldeps/c-link-to-rust-staticlib/bar.c rename to tests/run-make/c-link-to-rust-staticlib/bar.c diff --git a/tests/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs b/tests/run-make/c-link-to-rust-staticlib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs rename to tests/run-make/c-link-to-rust-staticlib/foo.rs diff --git a/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/tests/run-make/c-link-to-rust-va-list-fn/Makefile similarity index 86% rename from tests/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile rename to tests/run-make/c-link-to-rust-va-list-fn/Makefile index 9ce2a34e677b3..596c0fce3ceae 100644 --- a/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile +++ b/tests/run-make/c-link-to-rust-va-list-fn/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/checkrust.rs b/tests/run-make/c-link-to-rust-va-list-fn/checkrust.rs similarity index 100% rename from tests/run-make-fulldeps/c-link-to-rust-va-list-fn/checkrust.rs rename to tests/run-make/c-link-to-rust-va-list-fn/checkrust.rs diff --git a/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/test.c b/tests/run-make/c-link-to-rust-va-list-fn/test.c similarity index 100% rename from tests/run-make-fulldeps/c-link-to-rust-va-list-fn/test.c rename to tests/run-make/c-link-to-rust-va-list-fn/test.c diff --git a/tests/run-make-fulldeps/c-static-dylib/Makefile b/tests/run-make/c-static-dylib/Makefile similarity index 89% rename from tests/run-make-fulldeps/c-static-dylib/Makefile rename to tests/run-make/c-static-dylib/Makefile index 5b78005e3ee35..4e23edb6c57a4 100644 --- a/tests/run-make-fulldeps/c-static-dylib/Makefile +++ b/tests/run-make/c-static-dylib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,cfoo) diff --git a/tests/run-make-fulldeps/c-static-dylib/bar.rs b/tests/run-make/c-static-dylib/bar.rs similarity index 100% rename from tests/run-make-fulldeps/c-static-dylib/bar.rs rename to tests/run-make/c-static-dylib/bar.rs diff --git a/tests/run-make-fulldeps/c-static-dylib/cfoo.c b/tests/run-make/c-static-dylib/cfoo.c similarity index 100% rename from tests/run-make-fulldeps/c-static-dylib/cfoo.c rename to tests/run-make/c-static-dylib/cfoo.c diff --git a/tests/run-make-fulldeps/c-static-dylib/foo.rs b/tests/run-make/c-static-dylib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/c-static-dylib/foo.rs rename to tests/run-make/c-static-dylib/foo.rs diff --git a/tests/run-make-fulldeps/c-static-rlib/Makefile b/tests/run-make/c-static-rlib/Makefile similarity index 87% rename from tests/run-make-fulldeps/c-static-rlib/Makefile rename to tests/run-make/c-static-rlib/Makefile index 11a3cf1940c64..4e351127cb67c 100644 --- a/tests/run-make-fulldeps/c-static-rlib/Makefile +++ b/tests/run-make/c-static-rlib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,cfoo) diff --git a/tests/run-make-fulldeps/c-static-rlib/bar.rs b/tests/run-make/c-static-rlib/bar.rs similarity index 100% rename from tests/run-make-fulldeps/c-static-rlib/bar.rs rename to tests/run-make/c-static-rlib/bar.rs diff --git a/tests/run-make-fulldeps/c-static-rlib/cfoo.c b/tests/run-make/c-static-rlib/cfoo.c similarity index 100% rename from tests/run-make-fulldeps/c-static-rlib/cfoo.c rename to tests/run-make/c-static-rlib/cfoo.c diff --git a/tests/run-make-fulldeps/c-static-rlib/foo.rs b/tests/run-make/c-static-rlib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/c-static-rlib/foo.rs rename to tests/run-make/c-static-rlib/foo.rs diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile b/tests/run-make/c-unwind-abi-catch-lib-panic/Makefile similarity index 97% rename from tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile rename to tests/run-make/c-unwind-abi-catch-lib-panic/Makefile index 134f000d4535b..9c41a5a717e75 100644 --- a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile +++ b/tests/run-make/c-unwind-abi-catch-lib-panic/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: archive diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/add.c b/tests/run-make/c-unwind-abi-catch-lib-panic/add.c similarity index 100% rename from tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/add.c rename to tests/run-make/c-unwind-abi-catch-lib-panic/add.c diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/main.rs b/tests/run-make/c-unwind-abi-catch-lib-panic/main.rs similarity index 100% rename from tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/main.rs rename to tests/run-make/c-unwind-abi-catch-lib-panic/main.rs diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/panic.rs b/tests/run-make/c-unwind-abi-catch-lib-panic/panic.rs similarity index 100% rename from tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/panic.rs rename to tests/run-make/c-unwind-abi-catch-lib-panic/panic.rs diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile b/tests/run-make/c-unwind-abi-catch-panic/Makefile similarity index 81% rename from tests/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile rename to tests/run-make/c-unwind-abi-catch-panic/Makefile index e93ec99da2a57..4398ac2ee24c4 100644 --- a/tests/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile +++ b/tests/run-make/c-unwind-abi-catch-panic/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,add) diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-panic/add.c b/tests/run-make/c-unwind-abi-catch-panic/add.c similarity index 100% rename from tests/run-make-fulldeps/c-unwind-abi-catch-panic/add.c rename to tests/run-make/c-unwind-abi-catch-panic/add.c diff --git a/tests/run-make-fulldeps/c-unwind-abi-catch-panic/main.rs b/tests/run-make/c-unwind-abi-catch-panic/main.rs similarity index 100% rename from tests/run-make-fulldeps/c-unwind-abi-catch-panic/main.rs rename to tests/run-make/c-unwind-abi-catch-panic/main.rs diff --git a/tests/run-make-fulldeps/cat-and-grep-sanity-check/Makefile b/tests/run-make/cat-and-grep-sanity-check/Makefile similarity index 100% rename from tests/run-make-fulldeps/cat-and-grep-sanity-check/Makefile rename to tests/run-make/cat-and-grep-sanity-check/Makefile diff --git a/tests/run-make-fulldeps/cdylib-dylib-linkage/Makefile b/tests/run-make/cdylib-dylib-linkage/Makefile similarity index 97% rename from tests/run-make-fulldeps/cdylib-dylib-linkage/Makefile rename to tests/run-make/cdylib-dylib-linkage/Makefile index 5c9b2d1bb2f1e..51fbfef2d85f7 100644 --- a/tests/run-make-fulldeps/cdylib-dylib-linkage/Makefile +++ b/tests/run-make/cdylib-dylib-linkage/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk TARGET_SYSROOT := $(shell $(RUSTC) --print sysroot)/lib/rustlib/$(TARGET)/lib diff --git a/tests/run-make-fulldeps/cdylib-dylib-linkage/bar.rs b/tests/run-make/cdylib-dylib-linkage/bar.rs similarity index 100% rename from tests/run-make-fulldeps/cdylib-dylib-linkage/bar.rs rename to tests/run-make/cdylib-dylib-linkage/bar.rs diff --git a/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.c b/tests/run-make/cdylib-dylib-linkage/foo.c similarity index 100% rename from tests/run-make-fulldeps/cdylib-dylib-linkage/foo.c rename to tests/run-make/cdylib-dylib-linkage/foo.c diff --git a/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.rs b/tests/run-make/cdylib-dylib-linkage/foo.rs similarity index 100% rename from tests/run-make-fulldeps/cdylib-dylib-linkage/foo.rs rename to tests/run-make/cdylib-dylib-linkage/foo.rs diff --git a/tests/run-make-fulldeps/cdylib-fewer-symbols/Makefile b/tests/run-make/cdylib-fewer-symbols/Makefile similarity index 94% rename from tests/run-make-fulldeps/cdylib-fewer-symbols/Makefile rename to tests/run-make/cdylib-fewer-symbols/Makefile index 324791af8dee5..4e08f979c36b4 100644 --- a/tests/run-make-fulldeps/cdylib-fewer-symbols/Makefile +++ b/tests/run-make/cdylib-fewer-symbols/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile # Test that allocator-related symbols don't show up as exported from a cdylib as # they're internal to Rust and not part of the public ABI. diff --git a/tests/run-make-fulldeps/cdylib-fewer-symbols/foo.rs b/tests/run-make/cdylib-fewer-symbols/foo.rs similarity index 100% rename from tests/run-make-fulldeps/cdylib-fewer-symbols/foo.rs rename to tests/run-make/cdylib-fewer-symbols/foo.rs diff --git a/tests/run-make-fulldeps/cdylib/Makefile b/tests/run-make/cdylib/Makefile similarity index 94% rename from tests/run-make-fulldeps/cdylib/Makefile rename to tests/run-make/cdylib/Makefile index 47ec762b3e94c..3c8b526955452 100644 --- a/tests/run-make-fulldeps/cdylib/Makefile +++ b/tests/run-make/cdylib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call RUN_BINFILE,foo) diff --git a/tests/run-make-fulldeps/cdylib/bar.rs b/tests/run-make/cdylib/bar.rs similarity index 100% rename from tests/run-make-fulldeps/cdylib/bar.rs rename to tests/run-make/cdylib/bar.rs diff --git a/tests/run-make-fulldeps/cdylib/foo.c b/tests/run-make/cdylib/foo.c similarity index 100% rename from tests/run-make-fulldeps/cdylib/foo.c rename to tests/run-make/cdylib/foo.c diff --git a/tests/run-make-fulldeps/cdylib/foo.rs b/tests/run-make/cdylib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/cdylib/foo.rs rename to tests/run-make/cdylib/foo.rs diff --git a/tests/run-make-fulldeps/codegen-options-parsing/Makefile b/tests/run-make/codegen-options-parsing/Makefile similarity index 98% rename from tests/run-make-fulldeps/codegen-options-parsing/Makefile rename to tests/run-make/codegen-options-parsing/Makefile index b063593c9d97a..56bb900b7d8e8 100644 --- a/tests/run-make-fulldeps/codegen-options-parsing/Makefile +++ b/tests/run-make/codegen-options-parsing/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/codegen-options-parsing/dummy.rs b/tests/run-make/codegen-options-parsing/dummy.rs similarity index 100% rename from tests/run-make-fulldeps/codegen-options-parsing/dummy.rs rename to tests/run-make/codegen-options-parsing/dummy.rs diff --git a/tests/run-make-fulldeps/compile-stdin/Makefile b/tests/run-make/compile-stdin/Makefile similarity index 77% rename from tests/run-make-fulldeps/compile-stdin/Makefile rename to tests/run-make/compile-stdin/Makefile index be15548690fb5..2a495281c247f 100644 --- a/tests/run-make-fulldeps/compile-stdin/Makefile +++ b/tests/run-make/compile-stdin/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/compiler-lookup-paths-2/Makefile b/tests/run-make/compiler-lookup-paths-2/Makefile similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths-2/Makefile rename to tests/run-make/compiler-lookup-paths-2/Makefile diff --git a/tests/run-make-fulldeps/compiler-lookup-paths-2/a.rs b/tests/run-make/compiler-lookup-paths-2/a.rs similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths-2/a.rs rename to tests/run-make/compiler-lookup-paths-2/a.rs diff --git a/tests/run-make-fulldeps/compiler-lookup-paths-2/b.rs b/tests/run-make/compiler-lookup-paths-2/b.rs similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths-2/b.rs rename to tests/run-make/compiler-lookup-paths-2/b.rs diff --git a/tests/run-make-fulldeps/compiler-lookup-paths-2/c.rs b/tests/run-make/compiler-lookup-paths-2/c.rs similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths-2/c.rs rename to tests/run-make/compiler-lookup-paths-2/c.rs diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/Makefile b/tests/run-make/compiler-lookup-paths/Makefile similarity index 95% rename from tests/run-make-fulldeps/compiler-lookup-paths/Makefile rename to tests/run-make/compiler-lookup-paths/Makefile index c16bf7af6c48d..310d6772c342c 100644 --- a/tests/run-make-fulldeps/compiler-lookup-paths/Makefile +++ b/tests/run-make/compiler-lookup-paths/Makefile @@ -1,5 +1,8 @@ include ../tools.mk +# ignore-wasm32 (need a C compiler) +# ignore-wasm64 (need a C compiler) + all: $(TMPDIR)/libnative.a mkdir -p $(TMPDIR)/crate mkdir -p $(TMPDIR)/native diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/a.rs b/tests/run-make/compiler-lookup-paths/a.rs similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths/a.rs rename to tests/run-make/compiler-lookup-paths/a.rs diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/b.rs b/tests/run-make/compiler-lookup-paths/b.rs similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths/b.rs rename to tests/run-make/compiler-lookup-paths/b.rs diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/c.rs b/tests/run-make/compiler-lookup-paths/c.rs similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths/c.rs rename to tests/run-make/compiler-lookup-paths/c.rs diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/d.rs b/tests/run-make/compiler-lookup-paths/d.rs similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths/d.rs rename to tests/run-make/compiler-lookup-paths/d.rs diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/e.rs b/tests/run-make/compiler-lookup-paths/e.rs similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths/e.rs rename to tests/run-make/compiler-lookup-paths/e.rs diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/e2.rs b/tests/run-make/compiler-lookup-paths/e2.rs similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths/e2.rs rename to tests/run-make/compiler-lookup-paths/e2.rs diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/f.rs b/tests/run-make/compiler-lookup-paths/f.rs similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths/f.rs rename to tests/run-make/compiler-lookup-paths/f.rs diff --git a/tests/run-make-fulldeps/compiler-lookup-paths/native.c b/tests/run-make/compiler-lookup-paths/native.c similarity index 100% rename from tests/run-make-fulldeps/compiler-lookup-paths/native.c rename to tests/run-make/compiler-lookup-paths/native.c diff --git a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile b/tests/run-make/compiler-rt-works-on-mingw/Makefile similarity index 100% rename from tests/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile rename to tests/run-make/compiler-rt-works-on-mingw/Makefile diff --git a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp b/tests/run-make/compiler-rt-works-on-mingw/foo.cpp similarity index 100% rename from tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp rename to tests/run-make/compiler-rt-works-on-mingw/foo.cpp diff --git a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs b/tests/run-make/compiler-rt-works-on-mingw/foo.rs similarity index 100% rename from tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs rename to tests/run-make/compiler-rt-works-on-mingw/foo.rs diff --git a/tests/run-make/const_fn_mir/Makefile b/tests/run-make/const_fn_mir/Makefile index ad5695093a1a2..b2c268f04396c 100644 --- a/tests/run-make/const_fn_mir/Makefile +++ b/tests/run-make/const_fn_mir/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) main.rs --emit=mir -o "$(TMPDIR)"/dump.mir diff --git a/tests/run-make-fulldeps/core-no-fp-fmt-parse/Makefile b/tests/run-make/core-no-fp-fmt-parse/Makefile similarity index 100% rename from tests/run-make-fulldeps/core-no-fp-fmt-parse/Makefile rename to tests/run-make/core-no-fp-fmt-parse/Makefile diff --git a/tests/run-make/coverage/coverage_tools.mk b/tests/run-make/coverage/coverage_tools.mk index 0b6bbc33167c1..028c020a461d0 100644 --- a/tests/run-make/coverage/coverage_tools.mk +++ b/tests/run-make/coverage/coverage_tools.mk @@ -3,4 +3,4 @@ # # include ../coverage/coverage_tools.mk -include ../../run-make-fulldeps/tools.mk +include ../tools.mk diff --git a/tests/run-make-fulldeps/crate-data-smoke/Makefile b/tests/run-make/crate-data-smoke/Makefile similarity index 100% rename from tests/run-make-fulldeps/crate-data-smoke/Makefile rename to tests/run-make/crate-data-smoke/Makefile diff --git a/tests/run-make-fulldeps/crate-data-smoke/crate.rs b/tests/run-make/crate-data-smoke/crate.rs similarity index 100% rename from tests/run-make-fulldeps/crate-data-smoke/crate.rs rename to tests/run-make/crate-data-smoke/crate.rs diff --git a/tests/run-make-fulldeps/crate-data-smoke/lib.rs b/tests/run-make/crate-data-smoke/lib.rs similarity index 100% rename from tests/run-make-fulldeps/crate-data-smoke/lib.rs rename to tests/run-make/crate-data-smoke/lib.rs diff --git a/tests/run-make-fulldeps/crate-data-smoke/rlib.rs b/tests/run-make/crate-data-smoke/rlib.rs similarity index 100% rename from tests/run-make-fulldeps/crate-data-smoke/rlib.rs rename to tests/run-make/crate-data-smoke/rlib.rs diff --git a/tests/run-make-fulldeps/crate-hash-rustc-version/Makefile b/tests/run-make/crate-hash-rustc-version/Makefile similarity index 96% rename from tests/run-make-fulldeps/crate-hash-rustc-version/Makefile rename to tests/run-make/crate-hash-rustc-version/Makefile index 4f25a865ebd1f..f1d2a36041045 100644 --- a/tests/run-make-fulldeps/crate-hash-rustc-version/Makefile +++ b/tests/run-make/crate-hash-rustc-version/Makefile @@ -1,4 +1,5 @@ -include ../../run-make-fulldeps/tools.mk +# ignore-cross-compile +include ../tools.mk # Ensure that crates compiled with different rustc versions cannot # be dynamically linked. diff --git a/tests/run-make-fulldeps/crate-hash-rustc-version/a.rs b/tests/run-make/crate-hash-rustc-version/a.rs similarity index 100% rename from tests/run-make-fulldeps/crate-hash-rustc-version/a.rs rename to tests/run-make/crate-hash-rustc-version/a.rs diff --git a/tests/run-make-fulldeps/crate-hash-rustc-version/b.rs b/tests/run-make/crate-hash-rustc-version/b.rs similarity index 100% rename from tests/run-make-fulldeps/crate-hash-rustc-version/b.rs rename to tests/run-make/crate-hash-rustc-version/b.rs diff --git a/tests/run-make-fulldeps/crate-name-priority/Makefile b/tests/run-make/crate-name-priority/Makefile similarity index 91% rename from tests/run-make-fulldeps/crate-name-priority/Makefile rename to tests/run-make/crate-name-priority/Makefile index 08a07c325e310..4adaa75a71cf6 100644 --- a/tests/run-make-fulldeps/crate-name-priority/Makefile +++ b/tests/run-make/crate-name-priority/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/crate-name-priority/foo.rs b/tests/run-make/crate-name-priority/foo.rs similarity index 100% rename from tests/run-make-fulldeps/crate-name-priority/foo.rs rename to tests/run-make/crate-name-priority/foo.rs diff --git a/tests/run-make-fulldeps/crate-name-priority/foo1.rs b/tests/run-make/crate-name-priority/foo1.rs similarity index 100% rename from tests/run-make-fulldeps/crate-name-priority/foo1.rs rename to tests/run-make/crate-name-priority/foo1.rs diff --git a/tests/run-make-fulldeps/cross-lang-lto-clang/Makefile b/tests/run-make/cross-lang-lto-clang/Makefile similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-clang/Makefile rename to tests/run-make/cross-lang-lto-clang/Makefile diff --git a/tests/run-make-fulldeps/cross-lang-lto-clang/clib.c b/tests/run-make/cross-lang-lto-clang/clib.c similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-clang/clib.c rename to tests/run-make/cross-lang-lto-clang/clib.c diff --git a/tests/run-make-fulldeps/cross-lang-lto-clang/cmain.c b/tests/run-make/cross-lang-lto-clang/cmain.c similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-clang/cmain.c rename to tests/run-make/cross-lang-lto-clang/cmain.c diff --git a/tests/run-make-fulldeps/cross-lang-lto-clang/main.rs b/tests/run-make/cross-lang-lto-clang/main.rs similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-clang/main.rs rename to tests/run-make/cross-lang-lto-clang/main.rs diff --git a/tests/run-make-fulldeps/cross-lang-lto-clang/rustlib.rs b/tests/run-make/cross-lang-lto-clang/rustlib.rs similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-clang/rustlib.rs rename to tests/run-make/cross-lang-lto-clang/rustlib.rs diff --git a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile b/tests/run-make/cross-lang-lto-pgo-smoketest/Makefile similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile rename to tests/run-make/cross-lang-lto-pgo-smoketest/Makefile diff --git a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/clib.c b/tests/run-make/cross-lang-lto-pgo-smoketest/clib.c similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/clib.c rename to tests/run-make/cross-lang-lto-pgo-smoketest/clib.c diff --git a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/cmain.c b/tests/run-make/cross-lang-lto-pgo-smoketest/cmain.c similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/cmain.c rename to tests/run-make/cross-lang-lto-pgo-smoketest/cmain.c diff --git a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/main.rs b/tests/run-make/cross-lang-lto-pgo-smoketest/main.rs similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/main.rs rename to tests/run-make/cross-lang-lto-pgo-smoketest/main.rs diff --git a/tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/rustlib.rs b/tests/run-make/cross-lang-lto-pgo-smoketest/rustlib.rs similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-pgo-smoketest/rustlib.rs rename to tests/run-make/cross-lang-lto-pgo-smoketest/rustlib.rs diff --git a/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile b/tests/run-make/cross-lang-lto-upstream-rlibs/Makefile similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile rename to tests/run-make/cross-lang-lto-upstream-rlibs/Makefile diff --git a/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs b/tests/run-make/cross-lang-lto-upstream-rlibs/staticlib.rs similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/staticlib.rs rename to tests/run-make/cross-lang-lto-upstream-rlibs/staticlib.rs diff --git a/tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs b/tests/run-make/cross-lang-lto-upstream-rlibs/upstream.rs similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto-upstream-rlibs/upstream.rs rename to tests/run-make/cross-lang-lto-upstream-rlibs/upstream.rs diff --git a/tests/run-make-fulldeps/cross-lang-lto/Makefile b/tests/run-make/cross-lang-lto/Makefile similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto/Makefile rename to tests/run-make/cross-lang-lto/Makefile diff --git a/tests/run-make-fulldeps/cross-lang-lto/lib.rs b/tests/run-make/cross-lang-lto/lib.rs similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto/lib.rs rename to tests/run-make/cross-lang-lto/lib.rs diff --git a/tests/run-make-fulldeps/cross-lang-lto/main.rs b/tests/run-make/cross-lang-lto/main.rs similarity index 100% rename from tests/run-make-fulldeps/cross-lang-lto/main.rs rename to tests/run-make/cross-lang-lto/main.rs diff --git a/tests/run-make-fulldeps/debug-assertions/Makefile b/tests/run-make/debug-assertions/Makefile similarity index 96% rename from tests/run-make-fulldeps/debug-assertions/Makefile rename to tests/run-make/debug-assertions/Makefile index 73beb4b03ae10..e83337c597f5b 100644 --- a/tests/run-make-fulldeps/debug-assertions/Makefile +++ b/tests/run-make/debug-assertions/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/debug-assertions/debug.rs b/tests/run-make/debug-assertions/debug.rs similarity index 100% rename from tests/run-make-fulldeps/debug-assertions/debug.rs rename to tests/run-make/debug-assertions/debug.rs diff --git a/tests/run-make/dep-graph/Makefile b/tests/run-make/dep-graph/Makefile index ae97b1672ae27..d06333f4454b0 100644 --- a/tests/run-make/dep-graph/Makefile +++ b/tests/run-make/dep-graph/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # ignore-cross-compile diff --git a/tests/run-make-fulldeps/dep-info-doesnt-run-much/Makefile b/tests/run-make/dep-info-doesnt-run-much/Makefile similarity index 100% rename from tests/run-make-fulldeps/dep-info-doesnt-run-much/Makefile rename to tests/run-make/dep-info-doesnt-run-much/Makefile diff --git a/tests/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs b/tests/run-make/dep-info-doesnt-run-much/foo.rs similarity index 100% rename from tests/run-make-fulldeps/dep-info-doesnt-run-much/foo.rs rename to tests/run-make/dep-info-doesnt-run-much/foo.rs diff --git a/tests/run-make-fulldeps/dep-info-spaces/Makefile b/tests/run-make/dep-info-spaces/Makefile similarity index 100% rename from tests/run-make-fulldeps/dep-info-spaces/Makefile rename to tests/run-make/dep-info-spaces/Makefile diff --git a/tests/run-make-fulldeps/dep-info-spaces/Makefile.foo b/tests/run-make/dep-info-spaces/Makefile.foo similarity index 100% rename from tests/run-make-fulldeps/dep-info-spaces/Makefile.foo rename to tests/run-make/dep-info-spaces/Makefile.foo diff --git a/tests/run-make-fulldeps/dep-info-spaces/bar.rs b/tests/run-make/dep-info-spaces/bar.rs similarity index 100% rename from tests/run-make-fulldeps/dep-info-spaces/bar.rs rename to tests/run-make/dep-info-spaces/bar.rs diff --git a/tests/run-make-fulldeps/dep-info-spaces/foo foo.rs b/tests/run-make/dep-info-spaces/foo foo.rs similarity index 100% rename from tests/run-make-fulldeps/dep-info-spaces/foo foo.rs rename to tests/run-make/dep-info-spaces/foo foo.rs diff --git a/tests/run-make-fulldeps/dep-info-spaces/lib.rs b/tests/run-make/dep-info-spaces/lib.rs similarity index 100% rename from tests/run-make-fulldeps/dep-info-spaces/lib.rs rename to tests/run-make/dep-info-spaces/lib.rs diff --git a/tests/run-make-fulldeps/dep-info/Makefile b/tests/run-make/dep-info/Makefile similarity index 100% rename from tests/run-make-fulldeps/dep-info/Makefile rename to tests/run-make/dep-info/Makefile diff --git a/tests/run-make-fulldeps/dep-info/Makefile.foo b/tests/run-make/dep-info/Makefile.foo similarity index 100% rename from tests/run-make-fulldeps/dep-info/Makefile.foo rename to tests/run-make/dep-info/Makefile.foo diff --git a/tests/run-make-fulldeps/dep-info/bar.rs b/tests/run-make/dep-info/bar.rs similarity index 100% rename from tests/run-make-fulldeps/dep-info/bar.rs rename to tests/run-make/dep-info/bar.rs diff --git a/tests/run-make-fulldeps/dep-info/foo.rs b/tests/run-make/dep-info/foo.rs similarity index 100% rename from tests/run-make-fulldeps/dep-info/foo.rs rename to tests/run-make/dep-info/foo.rs diff --git a/tests/run-make-fulldeps/dep-info/lib.rs b/tests/run-make/dep-info/lib.rs similarity index 100% rename from tests/run-make-fulldeps/dep-info/lib.rs rename to tests/run-make/dep-info/lib.rs diff --git a/tests/run-make-fulldeps/dep-info/lib2.rs b/tests/run-make/dep-info/lib2.rs similarity index 100% rename from tests/run-make-fulldeps/dep-info/lib2.rs rename to tests/run-make/dep-info/lib2.rs diff --git a/tests/run-make-fulldeps/doctests-keep-binaries/Makefile b/tests/run-make/doctests-keep-binaries/Makefile similarity index 94% rename from tests/run-make-fulldeps/doctests-keep-binaries/Makefile rename to tests/run-make/doctests-keep-binaries/Makefile index 273c8980b0224..6254e93d3334f 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 similarity index 100% rename from tests/run-make-fulldeps/doctests-keep-binaries/t.rs rename to tests/run-make/doctests-keep-binaries/t.rs diff --git a/tests/run-make/dump-mono-stats/Makefile b/tests/run-make/dump-mono-stats/Makefile index fe1112fb0a4a8..196f84be6ecaa 100644 --- a/tests/run-make/dump-mono-stats/Makefile +++ b/tests/run-make/dump-mono-stats/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) --crate-type lib foo.rs -Z dump-mono-stats=$(TMPDIR) -Zdump-mono-stats-format=json diff --git a/tests/run-make-fulldeps/duplicate-output-flavors/Makefile b/tests/run-make/duplicate-output-flavors/Makefile similarity index 100% rename from tests/run-make-fulldeps/duplicate-output-flavors/Makefile rename to tests/run-make/duplicate-output-flavors/Makefile diff --git a/tests/run-make-fulldeps/duplicate-output-flavors/foo.rs b/tests/run-make/duplicate-output-flavors/foo.rs similarity index 100% rename from tests/run-make-fulldeps/duplicate-output-flavors/foo.rs rename to tests/run-make/duplicate-output-flavors/foo.rs diff --git a/tests/run-make-fulldeps/dylib-chain/Makefile b/tests/run-make/dylib-chain/Makefile similarity index 91% rename from tests/run-make-fulldeps/dylib-chain/Makefile rename to tests/run-make/dylib-chain/Makefile index 1139822f4ea91..f1fea99c5ee91 100644 --- a/tests/run-make-fulldeps/dylib-chain/Makefile +++ b/tests/run-make/dylib-chain/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/dylib-chain/m1.rs b/tests/run-make/dylib-chain/m1.rs similarity index 100% rename from tests/run-make-fulldeps/dylib-chain/m1.rs rename to tests/run-make/dylib-chain/m1.rs diff --git a/tests/run-make-fulldeps/dylib-chain/m2.rs b/tests/run-make/dylib-chain/m2.rs similarity index 100% rename from tests/run-make-fulldeps/dylib-chain/m2.rs rename to tests/run-make/dylib-chain/m2.rs diff --git a/tests/run-make-fulldeps/dylib-chain/m3.rs b/tests/run-make/dylib-chain/m3.rs similarity index 100% rename from tests/run-make-fulldeps/dylib-chain/m3.rs rename to tests/run-make/dylib-chain/m3.rs diff --git a/tests/run-make-fulldeps/dylib-chain/m4.rs b/tests/run-make/dylib-chain/m4.rs similarity index 100% rename from tests/run-make-fulldeps/dylib-chain/m4.rs rename to tests/run-make/dylib-chain/m4.rs diff --git a/tests/run-make/emit-named-files/Makefile b/tests/run-make/emit-named-files/Makefile index e081fa4793bb1..2b97b841fc00d 100644 --- a/tests/run-make/emit-named-files/Makefile +++ b/tests/run-make/emit-named-files/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk OUT=$(TMPDIR)/emit diff --git a/tests/run-make/emit-path-unhashed/Makefile b/tests/run-make/emit-path-unhashed/Makefile index c144d4aa92f67..74047fe5f8631 100644 --- a/tests/run-make/emit-path-unhashed/Makefile +++ b/tests/run-make/emit-path-unhashed/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk OUT=$(TMPDIR)/emit diff --git a/tests/run-make/emit-shared-files/Makefile b/tests/run-make/emit-shared-files/Makefile index cad0c9e5b8153..27c72b003686d 100644 --- a/tests/run-make/emit-shared-files/Makefile +++ b/tests/run-make/emit-shared-files/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk INVOCATION_ONLY = $(TMPDIR)/invocation-only TOOLCHAIN_ONLY = $(TMPDIR)/toolchain-only diff --git a/tests/run-make-fulldeps/emit-stack-sizes/Makefile b/tests/run-make/emit-stack-sizes/Makefile similarity index 100% rename from tests/run-make-fulldeps/emit-stack-sizes/Makefile rename to tests/run-make/emit-stack-sizes/Makefile diff --git a/tests/run-make-fulldeps/emit-stack-sizes/foo.rs b/tests/run-make/emit-stack-sizes/foo.rs similarity index 100% rename from tests/run-make-fulldeps/emit-stack-sizes/foo.rs rename to tests/run-make/emit-stack-sizes/foo.rs diff --git a/tests/run-make-fulldeps/emit/Makefile b/tests/run-make/emit/Makefile similarity index 97% rename from tests/run-make-fulldeps/emit/Makefile rename to tests/run-make/emit/Makefile index 78e68bd61114f..b3ca0b79fb0cf 100644 --- a/tests/run-make-fulldeps/emit/Makefile +++ b/tests/run-make/emit/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/emit/test-24876.rs b/tests/run-make/emit/test-24876.rs similarity index 100% rename from tests/run-make-fulldeps/emit/test-24876.rs rename to tests/run-make/emit/test-24876.rs diff --git a/tests/run-make-fulldeps/emit/test-26235.rs b/tests/run-make/emit/test-26235.rs similarity index 100% rename from tests/run-make-fulldeps/emit/test-26235.rs rename to tests/run-make/emit/test-26235.rs diff --git a/tests/run-make/env-dep-info/Makefile b/tests/run-make/env-dep-info/Makefile index 1675a61b1673b..bc0ffc2df1e0b 100644 --- a/tests/run-make/env-dep-info/Makefile +++ b/tests/run-make/env-dep-info/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC` # instead of hardcoding them everywhere they're needed. diff --git a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile b/tests/run-make/error-found-staticlib-instead-crate/Makefile similarity index 100% rename from tests/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile rename to tests/run-make/error-found-staticlib-instead-crate/Makefile diff --git a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs b/tests/run-make/error-found-staticlib-instead-crate/bar.rs similarity index 100% rename from tests/run-make-fulldeps/error-found-staticlib-instead-crate/bar.rs rename to tests/run-make/error-found-staticlib-instead-crate/bar.rs diff --git a/tests/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs b/tests/run-make/error-found-staticlib-instead-crate/foo.rs similarity index 100% rename from tests/run-make-fulldeps/error-found-staticlib-instead-crate/foo.rs rename to tests/run-make/error-found-staticlib-instead-crate/foo.rs diff --git a/tests/run-make-fulldeps/error-writing-dependencies/Makefile b/tests/run-make/error-writing-dependencies/Makefile similarity index 100% rename from tests/run-make-fulldeps/error-writing-dependencies/Makefile rename to tests/run-make/error-writing-dependencies/Makefile diff --git a/tests/run-make-fulldeps/error-writing-dependencies/foo.rs b/tests/run-make/error-writing-dependencies/foo.rs similarity index 100% rename from tests/run-make-fulldeps/error-writing-dependencies/foo.rs rename to tests/run-make/error-writing-dependencies/foo.rs diff --git a/tests/run-make-fulldeps/exit-code/Makefile b/tests/run-make/exit-code/Makefile similarity index 94% rename from tests/run-make-fulldeps/exit-code/Makefile rename to tests/run-make/exit-code/Makefile index 3ffaafe90657c..6458b71688fff 100644 --- a/tests/run-make-fulldeps/exit-code/Makefile +++ b/tests/run-make/exit-code/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/exit-code/compile-error.rs b/tests/run-make/exit-code/compile-error.rs similarity index 100% rename from tests/run-make-fulldeps/exit-code/compile-error.rs rename to tests/run-make/exit-code/compile-error.rs diff --git a/tests/run-make-fulldeps/exit-code/lint-failure.rs b/tests/run-make/exit-code/lint-failure.rs similarity index 100% rename from tests/run-make-fulldeps/exit-code/lint-failure.rs rename to tests/run-make/exit-code/lint-failure.rs diff --git a/tests/run-make-fulldeps/exit-code/success.rs b/tests/run-make/exit-code/success.rs similarity index 100% rename from tests/run-make-fulldeps/exit-code/success.rs rename to tests/run-make/exit-code/success.rs diff --git a/tests/run-make/export-executable-symbols/Makefile b/tests/run-make/export-executable-symbols/Makefile index daa77c99dcdd6..c4d29aa2bf450 100644 --- a/tests/run-make/export-executable-symbols/Makefile +++ b/tests/run-make/export-executable-symbols/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # ignore-wasm32 # ignore-wasm64 diff --git a/tests/run-make-fulldeps/extern-diff-internal-name/Makefile b/tests/run-make/extern-diff-internal-name/Makefile similarity index 80% rename from tests/run-make-fulldeps/extern-diff-internal-name/Makefile rename to tests/run-make/extern-diff-internal-name/Makefile index 54596c2f029e1..250f82dfac08e 100644 --- a/tests/run-make-fulldeps/extern-diff-internal-name/Makefile +++ b/tests/run-make/extern-diff-internal-name/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/extern-diff-internal-name/lib.rs b/tests/run-make/extern-diff-internal-name/lib.rs similarity index 100% rename from tests/run-make-fulldeps/extern-diff-internal-name/lib.rs rename to tests/run-make/extern-diff-internal-name/lib.rs diff --git a/tests/run-make-fulldeps/extern-diff-internal-name/test.rs b/tests/run-make/extern-diff-internal-name/test.rs similarity index 100% rename from tests/run-make-fulldeps/extern-diff-internal-name/test.rs rename to tests/run-make/extern-diff-internal-name/test.rs diff --git a/tests/run-make-fulldeps/extern-flag-disambiguates/Makefile b/tests/run-make/extern-flag-disambiguates/Makefile similarity index 96% rename from tests/run-make-fulldeps/extern-flag-disambiguates/Makefile rename to tests/run-make/extern-flag-disambiguates/Makefile index a8f142a6402e2..e54a537ecd062 100644 --- a/tests/run-make-fulldeps/extern-flag-disambiguates/Makefile +++ b/tests/run-make/extern-flag-disambiguates/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Attempt to build this dependency tree: diff --git a/tests/run-make-fulldeps/extern-flag-disambiguates/a.rs b/tests/run-make/extern-flag-disambiguates/a.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-disambiguates/a.rs rename to tests/run-make/extern-flag-disambiguates/a.rs diff --git a/tests/run-make-fulldeps/extern-flag-disambiguates/b.rs b/tests/run-make/extern-flag-disambiguates/b.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-disambiguates/b.rs rename to tests/run-make/extern-flag-disambiguates/b.rs diff --git a/tests/run-make-fulldeps/extern-flag-disambiguates/c.rs b/tests/run-make/extern-flag-disambiguates/c.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-disambiguates/c.rs rename to tests/run-make/extern-flag-disambiguates/c.rs diff --git a/tests/run-make-fulldeps/extern-flag-disambiguates/d.rs b/tests/run-make/extern-flag-disambiguates/d.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-disambiguates/d.rs rename to tests/run-make/extern-flag-disambiguates/d.rs diff --git a/tests/run-make-fulldeps/extern-flag-fun/Makefile b/tests/run-make/extern-flag-fun/Makefile similarity index 97% rename from tests/run-make-fulldeps/extern-flag-fun/Makefile rename to tests/run-make/extern-flag-fun/Makefile index a0b7c15edb9a5..687cdfd76755b 100644 --- a/tests/run-make-fulldeps/extern-flag-fun/Makefile +++ b/tests/run-make/extern-flag-fun/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/extern-flag-fun/bar-alt.rs b/tests/run-make/extern-flag-fun/bar-alt.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-fun/bar-alt.rs rename to tests/run-make/extern-flag-fun/bar-alt.rs diff --git a/tests/run-make-fulldeps/extern-flag-fun/bar.rs b/tests/run-make/extern-flag-fun/bar.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-fun/bar.rs rename to tests/run-make/extern-flag-fun/bar.rs diff --git a/tests/run-make-fulldeps/extern-flag-fun/foo.rs b/tests/run-make/extern-flag-fun/foo.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-fun/foo.rs rename to tests/run-make/extern-flag-fun/foo.rs diff --git a/tests/run-make-fulldeps/extern-flag-fun/gated_unstable.rs b/tests/run-make/extern-flag-fun/gated_unstable.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-fun/gated_unstable.rs rename to tests/run-make/extern-flag-fun/gated_unstable.rs diff --git a/tests/run-make-fulldeps/extern-flag-fun/rustc.rs b/tests/run-make/extern-flag-fun/rustc.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-fun/rustc.rs rename to tests/run-make/extern-flag-fun/rustc.rs diff --git a/tests/run-make-fulldeps/extern-flag-pathless/Makefile b/tests/run-make/extern-flag-pathless/Makefile similarity index 96% rename from tests/run-make-fulldeps/extern-flag-pathless/Makefile rename to tests/run-make/extern-flag-pathless/Makefile index 0f23815b6505b..701bfcd28c8a8 100644 --- a/tests/run-make-fulldeps/extern-flag-pathless/Makefile +++ b/tests/run-make/extern-flag-pathless/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Test mixing pathless --extern with paths. diff --git a/tests/run-make-fulldeps/extern-flag-pathless/bar-dynamic.rs b/tests/run-make/extern-flag-pathless/bar-dynamic.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-pathless/bar-dynamic.rs rename to tests/run-make/extern-flag-pathless/bar-dynamic.rs diff --git a/tests/run-make-fulldeps/extern-flag-pathless/bar-static.rs b/tests/run-make/extern-flag-pathless/bar-static.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-pathless/bar-static.rs rename to tests/run-make/extern-flag-pathless/bar-static.rs diff --git a/tests/run-make-fulldeps/extern-flag-pathless/foo.rs b/tests/run-make/extern-flag-pathless/foo.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-pathless/foo.rs rename to tests/run-make/extern-flag-pathless/foo.rs diff --git a/tests/run-make-fulldeps/extern-flag-rename-transitive/Makefile b/tests/run-make/extern-flag-rename-transitive/Makefile similarity index 100% rename from tests/run-make-fulldeps/extern-flag-rename-transitive/Makefile rename to tests/run-make/extern-flag-rename-transitive/Makefile diff --git a/tests/run-make-fulldeps/extern-flag-rename-transitive/bar.rs b/tests/run-make/extern-flag-rename-transitive/bar.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-rename-transitive/bar.rs rename to tests/run-make/extern-flag-rename-transitive/bar.rs diff --git a/tests/run-make-fulldeps/extern-flag-rename-transitive/baz.rs b/tests/run-make/extern-flag-rename-transitive/baz.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-rename-transitive/baz.rs rename to tests/run-make/extern-flag-rename-transitive/baz.rs diff --git a/tests/run-make-fulldeps/extern-flag-rename-transitive/foo.rs b/tests/run-make/extern-flag-rename-transitive/foo.rs similarity index 100% rename from tests/run-make-fulldeps/extern-flag-rename-transitive/foo.rs rename to tests/run-make/extern-flag-rename-transitive/foo.rs diff --git a/tests/run-make-fulldeps/extern-fn-generic/Makefile b/tests/run-make/extern-fn-generic/Makefile similarity index 84% rename from tests/run-make-fulldeps/extern-fn-generic/Makefile rename to tests/run-make/extern-fn-generic/Makefile index 71746fb10cbf4..7dceea6cb887c 100644 --- a/tests/run-make-fulldeps/extern-fn-generic/Makefile +++ b/tests/run-make/extern-fn-generic/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,test) diff --git a/tests/run-make-fulldeps/extern-fn-generic/test.c b/tests/run-make/extern-fn-generic/test.c similarity index 100% rename from tests/run-make-fulldeps/extern-fn-generic/test.c rename to tests/run-make/extern-fn-generic/test.c diff --git a/tests/run-make-fulldeps/extern-fn-generic/test.rs b/tests/run-make/extern-fn-generic/test.rs similarity index 100% rename from tests/run-make-fulldeps/extern-fn-generic/test.rs rename to tests/run-make/extern-fn-generic/test.rs diff --git a/tests/run-make-fulldeps/extern-fn-generic/testcrate.rs b/tests/run-make/extern-fn-generic/testcrate.rs similarity index 100% rename from tests/run-make-fulldeps/extern-fn-generic/testcrate.rs rename to tests/run-make/extern-fn-generic/testcrate.rs diff --git a/tests/run-make-fulldeps/extern-fn-mangle/Makefile b/tests/run-make/extern-fn-mangle/Makefile similarity index 81% rename from tests/run-make-fulldeps/extern-fn-mangle/Makefile rename to tests/run-make/extern-fn-mangle/Makefile index 4f5d026f213f2..3cbbf3839969f 100644 --- a/tests/run-make-fulldeps/extern-fn-mangle/Makefile +++ b/tests/run-make/extern-fn-mangle/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,test) diff --git a/tests/run-make-fulldeps/extern-fn-mangle/test.c b/tests/run-make/extern-fn-mangle/test.c similarity index 100% rename from tests/run-make-fulldeps/extern-fn-mangle/test.c rename to tests/run-make/extern-fn-mangle/test.c diff --git a/tests/run-make-fulldeps/extern-fn-mangle/test.rs b/tests/run-make/extern-fn-mangle/test.rs similarity index 100% rename from tests/run-make-fulldeps/extern-fn-mangle/test.rs rename to tests/run-make/extern-fn-mangle/test.rs diff --git a/tests/run-make-fulldeps/extern-fn-reachable/Makefile b/tests/run-make/extern-fn-reachable/Makefile similarity index 96% rename from tests/run-make-fulldeps/extern-fn-reachable/Makefile rename to tests/run-make/extern-fn-reachable/Makefile index 05bdb8d65b7bf..3297251bfd1aa 100644 --- a/tests/run-make-fulldeps/extern-fn-reachable/Makefile +++ b/tests/run-make/extern-fn-reachable/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-windows-msvc diff --git a/tests/run-make-fulldeps/extern-fn-reachable/dylib.rs b/tests/run-make/extern-fn-reachable/dylib.rs similarity index 100% rename from tests/run-make-fulldeps/extern-fn-reachable/dylib.rs rename to tests/run-make/extern-fn-reachable/dylib.rs diff --git a/tests/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile b/tests/run-make/extern-fn-struct-passing-abi/Makefile similarity index 81% rename from tests/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile rename to tests/run-make/extern-fn-struct-passing-abi/Makefile index 4f5d026f213f2..3cbbf3839969f 100644 --- a/tests/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile +++ b/tests/run-make/extern-fn-struct-passing-abi/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,test) diff --git a/tests/run-make-fulldeps/extern-fn-struct-passing-abi/test.c b/tests/run-make/extern-fn-struct-passing-abi/test.c similarity index 100% rename from tests/run-make-fulldeps/extern-fn-struct-passing-abi/test.c rename to tests/run-make/extern-fn-struct-passing-abi/test.c diff --git a/tests/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs b/tests/run-make/extern-fn-struct-passing-abi/test.rs similarity index 100% rename from tests/run-make-fulldeps/extern-fn-struct-passing-abi/test.rs rename to tests/run-make/extern-fn-struct-passing-abi/test.rs diff --git a/tests/run-make-fulldeps/extern-fn-with-extern-types/Makefile b/tests/run-make/extern-fn-with-extern-types/Makefile similarity index 81% rename from tests/run-make-fulldeps/extern-fn-with-extern-types/Makefile rename to tests/run-make/extern-fn-with-extern-types/Makefile index 1fa708950d436..07ec503aaaea5 100644 --- a/tests/run-make-fulldeps/extern-fn-with-extern-types/Makefile +++ b/tests/run-make/extern-fn-with-extern-types/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,ctest) diff --git a/tests/run-make-fulldeps/extern-fn-with-extern-types/ctest.c b/tests/run-make/extern-fn-with-extern-types/ctest.c similarity index 100% rename from tests/run-make-fulldeps/extern-fn-with-extern-types/ctest.c rename to tests/run-make/extern-fn-with-extern-types/ctest.c diff --git a/tests/run-make-fulldeps/extern-fn-with-extern-types/test.rs b/tests/run-make/extern-fn-with-extern-types/test.rs similarity index 100% rename from tests/run-make-fulldeps/extern-fn-with-extern-types/test.rs rename to tests/run-make/extern-fn-with-extern-types/test.rs diff --git a/tests/run-make-fulldeps/extern-fn-with-packed-struct/Makefile b/tests/run-make/extern-fn-with-packed-struct/Makefile similarity index 81% rename from tests/run-make-fulldeps/extern-fn-with-packed-struct/Makefile rename to tests/run-make/extern-fn-with-packed-struct/Makefile index 4f5d026f213f2..3cbbf3839969f 100644 --- a/tests/run-make-fulldeps/extern-fn-with-packed-struct/Makefile +++ b/tests/run-make/extern-fn-with-packed-struct/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,test) diff --git a/tests/run-make-fulldeps/extern-fn-with-packed-struct/test.c b/tests/run-make/extern-fn-with-packed-struct/test.c similarity index 100% rename from tests/run-make-fulldeps/extern-fn-with-packed-struct/test.c rename to tests/run-make/extern-fn-with-packed-struct/test.c diff --git a/tests/run-make-fulldeps/extern-fn-with-packed-struct/test.rs b/tests/run-make/extern-fn-with-packed-struct/test.rs similarity index 100% rename from tests/run-make-fulldeps/extern-fn-with-packed-struct/test.rs rename to tests/run-make/extern-fn-with-packed-struct/test.rs diff --git a/tests/run-make-fulldeps/extern-fn-with-union/Makefile b/tests/run-make/extern-fn-with-union/Makefile similarity index 84% rename from tests/run-make-fulldeps/extern-fn-with-union/Makefile rename to tests/run-make/extern-fn-with-union/Makefile index 40bae923e30b9..e6c8c9936791b 100644 --- a/tests/run-make-fulldeps/extern-fn-with-union/Makefile +++ b/tests/run-make/extern-fn-with-union/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,ctest) diff --git a/tests/run-make-fulldeps/extern-fn-with-union/ctest.c b/tests/run-make/extern-fn-with-union/ctest.c similarity index 100% rename from tests/run-make-fulldeps/extern-fn-with-union/ctest.c rename to tests/run-make/extern-fn-with-union/ctest.c diff --git a/tests/run-make-fulldeps/extern-fn-with-union/test.rs b/tests/run-make/extern-fn-with-union/test.rs similarity index 100% rename from tests/run-make-fulldeps/extern-fn-with-union/test.rs rename to tests/run-make/extern-fn-with-union/test.rs diff --git a/tests/run-make-fulldeps/extern-fn-with-union/testcrate.rs b/tests/run-make/extern-fn-with-union/testcrate.rs similarity index 100% rename from tests/run-make-fulldeps/extern-fn-with-union/testcrate.rs rename to tests/run-make/extern-fn-with-union/testcrate.rs diff --git a/tests/run-make-fulldeps/extern-multiple-copies/Makefile b/tests/run-make/extern-multiple-copies/Makefile similarity index 90% rename from tests/run-make-fulldeps/extern-multiple-copies/Makefile rename to tests/run-make/extern-multiple-copies/Makefile index 00668a6bc88c2..b0b84278edac3 100644 --- a/tests/run-make-fulldeps/extern-multiple-copies/Makefile +++ b/tests/run-make/extern-multiple-copies/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/extern-multiple-copies/bar.rs b/tests/run-make/extern-multiple-copies/bar.rs similarity index 100% rename from tests/run-make-fulldeps/extern-multiple-copies/bar.rs rename to tests/run-make/extern-multiple-copies/bar.rs diff --git a/tests/run-make-fulldeps/extern-multiple-copies/foo1.rs b/tests/run-make/extern-multiple-copies/foo1.rs similarity index 100% rename from tests/run-make-fulldeps/extern-multiple-copies/foo1.rs rename to tests/run-make/extern-multiple-copies/foo1.rs diff --git a/tests/run-make-fulldeps/extern-multiple-copies/foo2.rs b/tests/run-make/extern-multiple-copies/foo2.rs similarity index 100% rename from tests/run-make-fulldeps/extern-multiple-copies/foo2.rs rename to tests/run-make/extern-multiple-copies/foo2.rs diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/Makefile b/tests/run-make/extern-multiple-copies2/Makefile similarity index 91% rename from tests/run-make-fulldeps/extern-multiple-copies2/Makefile rename to tests/run-make/extern-multiple-copies2/Makefile index 84de2ebf34dfc..708b1c1b5409f 100644 --- a/tests/run-make-fulldeps/extern-multiple-copies2/Makefile +++ b/tests/run-make/extern-multiple-copies2/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/bar.rs b/tests/run-make/extern-multiple-copies2/bar.rs similarity index 100% rename from tests/run-make-fulldeps/extern-multiple-copies2/bar.rs rename to tests/run-make/extern-multiple-copies2/bar.rs diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs b/tests/run-make/extern-multiple-copies2/foo1.rs similarity index 100% rename from tests/run-make-fulldeps/extern-multiple-copies2/foo1.rs rename to tests/run-make/extern-multiple-copies2/foo1.rs diff --git a/tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs b/tests/run-make/extern-multiple-copies2/foo2.rs similarity index 100% rename from tests/run-make-fulldeps/extern-multiple-copies2/foo2.rs rename to tests/run-make/extern-multiple-copies2/foo2.rs diff --git a/tests/run-make-fulldeps/extern-overrides-distribution/Makefile b/tests/run-make/extern-overrides-distribution/Makefile similarity index 83% rename from tests/run-make-fulldeps/extern-overrides-distribution/Makefile rename to tests/run-make/extern-overrides-distribution/Makefile index c57b062cd5dd1..bfd0dd6991ba7 100644 --- a/tests/run-make-fulldeps/extern-overrides-distribution/Makefile +++ b/tests/run-make/extern-overrides-distribution/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/extern-overrides-distribution/libc.rs b/tests/run-make/extern-overrides-distribution/libc.rs similarity index 100% rename from tests/run-make-fulldeps/extern-overrides-distribution/libc.rs rename to tests/run-make/extern-overrides-distribution/libc.rs diff --git a/tests/run-make-fulldeps/extern-overrides-distribution/main.rs b/tests/run-make/extern-overrides-distribution/main.rs similarity index 100% rename from tests/run-make-fulldeps/extern-overrides-distribution/main.rs rename to tests/run-make/extern-overrides-distribution/main.rs diff --git a/tests/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile b/tests/run-make/extra-filename-with-temp-outputs/Makefile similarity index 86% rename from tests/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile rename to tests/run-make/extra-filename-with-temp-outputs/Makefile index 470448cf50c57..64745bef5b869 100644 --- a/tests/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile +++ b/tests/run-make/extra-filename-with-temp-outputs/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs b/tests/run-make/extra-filename-with-temp-outputs/foo.rs similarity index 100% rename from tests/run-make-fulldeps/extra-filename-with-temp-outputs/foo.rs rename to tests/run-make/extra-filename-with-temp-outputs/foo.rs diff --git a/tests/run-make/fmt-write-bloat/Makefile b/tests/run-make/fmt-write-bloat/Makefile index 536157754867c..70e04b9af51fe 100644 --- a/tests/run-make/fmt-write-bloat/Makefile +++ b/tests/run-make/fmt-write-bloat/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # ignore-windows diff --git a/tests/run-make-fulldeps/foreign-double-unwind/Makefile b/tests/run-make/foreign-double-unwind/Makefile similarity index 90% rename from tests/run-make-fulldeps/foreign-double-unwind/Makefile rename to tests/run-make/foreign-double-unwind/Makefile index ea2fe9ff881bc..f20fe3ce66e82 100644 --- a/tests/run-make-fulldeps/foreign-double-unwind/Makefile +++ b/tests/run-make/foreign-double-unwind/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: foo diff --git a/tests/run-make-fulldeps/foreign-double-unwind/foo.cpp b/tests/run-make/foreign-double-unwind/foo.cpp similarity index 100% rename from tests/run-make-fulldeps/foreign-double-unwind/foo.cpp rename to tests/run-make/foreign-double-unwind/foo.cpp diff --git a/tests/run-make-fulldeps/foreign-double-unwind/foo.rs b/tests/run-make/foreign-double-unwind/foo.rs similarity index 100% rename from tests/run-make-fulldeps/foreign-double-unwind/foo.rs rename to tests/run-make/foreign-double-unwind/foo.rs diff --git a/tests/run-make-fulldeps/foreign-exceptions/Makefile b/tests/run-make/foreign-exceptions/Makefile similarity index 89% rename from tests/run-make-fulldeps/foreign-exceptions/Makefile rename to tests/run-make/foreign-exceptions/Makefile index 38fe2773df2e7..a8e20ffb1f498 100644 --- a/tests/run-make-fulldeps/foreign-exceptions/Makefile +++ b/tests/run-make/foreign-exceptions/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: foo diff --git a/tests/run-make-fulldeps/foreign-exceptions/foo.cpp b/tests/run-make/foreign-exceptions/foo.cpp similarity index 100% rename from tests/run-make-fulldeps/foreign-exceptions/foo.cpp rename to tests/run-make/foreign-exceptions/foo.cpp diff --git a/tests/run-make-fulldeps/foreign-exceptions/foo.rs b/tests/run-make/foreign-exceptions/foo.rs similarity index 100% rename from tests/run-make-fulldeps/foreign-exceptions/foo.rs rename to tests/run-make/foreign-exceptions/foo.rs diff --git a/tests/run-make-fulldeps/foreign-rust-exceptions/Makefile b/tests/run-make/foreign-rust-exceptions/Makefile similarity index 92% rename from tests/run-make-fulldeps/foreign-rust-exceptions/Makefile rename to tests/run-make/foreign-rust-exceptions/Makefile index 50fca7f24e616..0d007bf1c49a4 100644 --- a/tests/run-make-fulldeps/foreign-rust-exceptions/Makefile +++ b/tests/run-make/foreign-rust-exceptions/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile # ignore-i686-pc-windows-gnu # This test doesn't work on 32-bit MinGW as cdylib has its own copy of unwinder diff --git a/tests/run-make-fulldeps/foreign-rust-exceptions/bar.rs b/tests/run-make/foreign-rust-exceptions/bar.rs similarity index 100% rename from tests/run-make-fulldeps/foreign-rust-exceptions/bar.rs rename to tests/run-make/foreign-rust-exceptions/bar.rs diff --git a/tests/run-make-fulldeps/foreign-rust-exceptions/foo.rs b/tests/run-make/foreign-rust-exceptions/foo.rs similarity index 100% rename from tests/run-make-fulldeps/foreign-rust-exceptions/foo.rs rename to tests/run-make/foreign-rust-exceptions/foo.rs diff --git a/tests/run-make-fulldeps/fpic/Makefile b/tests/run-make/fpic/Makefile similarity index 89% rename from tests/run-make-fulldeps/fpic/Makefile rename to tests/run-make/fpic/Makefile index 5986de3666f71..c38dd8d6e8c4b 100644 --- a/tests/run-make-fulldeps/fpic/Makefile +++ b/tests/run-make/fpic/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-windows diff --git a/tests/run-make-fulldeps/fpic/hello.rs b/tests/run-make/fpic/hello.rs similarity index 100% rename from tests/run-make-fulldeps/fpic/hello.rs rename to tests/run-make/fpic/hello.rs diff --git a/tests/run-make-fulldeps/glibc-staticlib-args/Makefile b/tests/run-make/glibc-staticlib-args/Makefile similarity index 92% rename from tests/run-make-fulldeps/glibc-staticlib-args/Makefile rename to tests/run-make/glibc-staticlib-args/Makefile index 39e64bacf5813..cad6c049e4594 100644 --- a/tests/run-make-fulldeps/glibc-staticlib-args/Makefile +++ b/tests/run-make/glibc-staticlib-args/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile # only-gnu # only-linux diff --git a/tests/run-make-fulldeps/glibc-staticlib-args/library.rs b/tests/run-make/glibc-staticlib-args/library.rs similarity index 100% rename from tests/run-make-fulldeps/glibc-staticlib-args/library.rs rename to tests/run-make/glibc-staticlib-args/library.rs diff --git a/tests/run-make-fulldeps/glibc-staticlib-args/program.c b/tests/run-make/glibc-staticlib-args/program.c similarity index 100% rename from tests/run-make-fulldeps/glibc-staticlib-args/program.c rename to tests/run-make/glibc-staticlib-args/program.c diff --git a/tests/run-make-fulldeps/hir-tree/Makefile b/tests/run-make/hir-tree/Makefile similarity index 100% rename from tests/run-make-fulldeps/hir-tree/Makefile rename to tests/run-make/hir-tree/Makefile diff --git a/tests/run-make-fulldeps/hir-tree/input.rs b/tests/run-make/hir-tree/input.rs similarity index 100% rename from tests/run-make-fulldeps/hir-tree/input.rs rename to tests/run-make/hir-tree/input.rs diff --git a/tests/run-make-fulldeps/include_bytes_deps/Makefile b/tests/run-make/include_bytes_deps/Makefile similarity index 100% rename from tests/run-make-fulldeps/include_bytes_deps/Makefile rename to tests/run-make/include_bytes_deps/Makefile diff --git a/tests/run-make-fulldeps/include_bytes_deps/input.bin b/tests/run-make/include_bytes_deps/input.bin similarity index 100% rename from tests/run-make-fulldeps/include_bytes_deps/input.bin rename to tests/run-make/include_bytes_deps/input.bin diff --git a/tests/run-make-fulldeps/include_bytes_deps/input.md b/tests/run-make/include_bytes_deps/input.md similarity index 100% rename from tests/run-make-fulldeps/include_bytes_deps/input.md rename to tests/run-make/include_bytes_deps/input.md diff --git a/tests/run-make-fulldeps/include_bytes_deps/input.txt b/tests/run-make/include_bytes_deps/input.txt similarity index 100% rename from tests/run-make-fulldeps/include_bytes_deps/input.txt rename to tests/run-make/include_bytes_deps/input.txt diff --git a/tests/run-make-fulldeps/include_bytes_deps/main.rs b/tests/run-make/include_bytes_deps/main.rs similarity index 100% rename from tests/run-make-fulldeps/include_bytes_deps/main.rs rename to tests/run-make/include_bytes_deps/main.rs diff --git a/tests/run-make-fulldeps/incr-add-rust-src-component/Makefile b/tests/run-make/incr-add-rust-src-component/Makefile similarity index 98% rename from tests/run-make-fulldeps/incr-add-rust-src-component/Makefile rename to tests/run-make/incr-add-rust-src-component/Makefile index 5c1d953cc05b6..fd09c2299f98e 100644 --- a/tests/run-make-fulldeps/incr-add-rust-src-component/Makefile +++ b/tests/run-make/incr-add-rust-src-component/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # rust-lang/rust#70924: Test that if we add rust-src component in between two diff --git a/tests/run-make-fulldeps/incr-add-rust-src-component/main.rs b/tests/run-make/incr-add-rust-src-component/main.rs similarity index 100% rename from tests/run-make-fulldeps/incr-add-rust-src-component/main.rs rename to tests/run-make/incr-add-rust-src-component/main.rs diff --git a/tests/run-make/incr-foreign-head-span/Makefile b/tests/run-make/incr-foreign-head-span/Makefile index 712965eaa883a..9d6102cdd72dc 100644 --- a/tests/run-make/incr-foreign-head-span/Makefile +++ b/tests/run-make/incr-foreign-head-span/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # ignore-none no-std is not supported # ignore-nvptx64-nvidia-cuda FIXME: can't find crate for 'std' diff --git a/tests/run-make/incr-prev-body-beyond-eof/Makefile b/tests/run-make/incr-prev-body-beyond-eof/Makefile index 24eea3acaeacd..aa47552f52c93 100644 --- a/tests/run-make/incr-prev-body-beyond-eof/Makefile +++ b/tests/run-make/incr-prev-body-beyond-eof/Makefile @@ -1,7 +1,7 @@ # ignore-none no-std is not supported # ignore-nvptx64-nvidia-cuda FIXME: can't find crate for `std` -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # Tests that we don't ICE during incremental compilation after modifying a # function span such that its previous end line exceeds the number of lines diff --git a/tests/run-make/incremental-session-fail/Makefile b/tests/run-make/incremental-session-fail/Makefile index 6ce1370927bc1..f43eece2eb709 100644 --- a/tests/run-make/incremental-session-fail/Makefile +++ b/tests/run-make/incremental-session-fail/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk SESSION_DIR := $(TMPDIR)/session OUTPUT_FILE := $(TMPDIR)/build-output diff --git a/tests/run-make-fulldeps/inline-always-many-cgu/Makefile b/tests/run-make/inline-always-many-cgu/Makefile similarity index 100% rename from tests/run-make-fulldeps/inline-always-many-cgu/Makefile rename to tests/run-make/inline-always-many-cgu/Makefile diff --git a/tests/run-make-fulldeps/inline-always-many-cgu/foo.rs b/tests/run-make/inline-always-many-cgu/foo.rs similarity index 100% rename from tests/run-make-fulldeps/inline-always-many-cgu/foo.rs rename to tests/run-make/inline-always-many-cgu/foo.rs diff --git a/tests/run-make-fulldeps/interdependent-c-libraries/Makefile b/tests/run-make/interdependent-c-libraries/Makefile similarity index 96% rename from tests/run-make-fulldeps/interdependent-c-libraries/Makefile rename to tests/run-make/interdependent-c-libraries/Makefile index dc5b55a99256e..53a696d82bf12 100644 --- a/tests/run-make-fulldeps/interdependent-c-libraries/Makefile +++ b/tests/run-make/interdependent-c-libraries/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # The rust crate foo will link to the native library foo, while the rust crate diff --git a/tests/run-make-fulldeps/interdependent-c-libraries/bar.c b/tests/run-make/interdependent-c-libraries/bar.c similarity index 100% rename from tests/run-make-fulldeps/interdependent-c-libraries/bar.c rename to tests/run-make/interdependent-c-libraries/bar.c diff --git a/tests/run-make-fulldeps/interdependent-c-libraries/bar.rs b/tests/run-make/interdependent-c-libraries/bar.rs similarity index 100% rename from tests/run-make-fulldeps/interdependent-c-libraries/bar.rs rename to tests/run-make/interdependent-c-libraries/bar.rs diff --git a/tests/run-make-fulldeps/interdependent-c-libraries/foo.c b/tests/run-make/interdependent-c-libraries/foo.c similarity index 100% rename from tests/run-make-fulldeps/interdependent-c-libraries/foo.c rename to tests/run-make/interdependent-c-libraries/foo.c diff --git a/tests/run-make-fulldeps/interdependent-c-libraries/foo.rs b/tests/run-make/interdependent-c-libraries/foo.rs similarity index 100% rename from tests/run-make-fulldeps/interdependent-c-libraries/foo.rs rename to tests/run-make/interdependent-c-libraries/foo.rs diff --git a/tests/run-make-fulldeps/interdependent-c-libraries/main.rs b/tests/run-make/interdependent-c-libraries/main.rs similarity index 100% rename from tests/run-make-fulldeps/interdependent-c-libraries/main.rs rename to tests/run-make/interdependent-c-libraries/main.rs diff --git a/tests/run-make-fulldeps/intrinsic-unreachable/Makefile b/tests/run-make/intrinsic-unreachable/Makefile similarity index 100% rename from tests/run-make-fulldeps/intrinsic-unreachable/Makefile rename to tests/run-make/intrinsic-unreachable/Makefile diff --git a/tests/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs b/tests/run-make/intrinsic-unreachable/exit-ret.rs similarity index 100% rename from tests/run-make-fulldeps/intrinsic-unreachable/exit-ret.rs rename to tests/run-make/intrinsic-unreachable/exit-ret.rs diff --git a/tests/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs b/tests/run-make/intrinsic-unreachable/exit-unreachable.rs similarity index 100% rename from tests/run-make-fulldeps/intrinsic-unreachable/exit-unreachable.rs rename to tests/run-make/intrinsic-unreachable/exit-unreachable.rs diff --git a/tests/run-make-fulldeps/invalid-library/Makefile b/tests/run-make/invalid-library/Makefile similarity index 100% rename from tests/run-make-fulldeps/invalid-library/Makefile rename to tests/run-make/invalid-library/Makefile diff --git a/tests/run-make-fulldeps/invalid-library/foo.rs b/tests/run-make/invalid-library/foo.rs similarity index 100% rename from tests/run-make-fulldeps/invalid-library/foo.rs rename to tests/run-make/invalid-library/foo.rs diff --git a/tests/run-make/invalid-so/Makefile b/tests/run-make/invalid-so/Makefile index 5b82ecd207dda..e36c7040bc6ca 100644 --- a/tests/run-make/invalid-so/Makefile +++ b/tests/run-make/invalid-so/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk DYLIB_NAME := $(shell echo | $(RUSTC) --crate-name foo --crate-type dylib --print file-names -) diff --git a/tests/run-make-fulldeps/invalid-staticlib/Makefile b/tests/run-make/invalid-staticlib/Makefile similarity index 100% rename from tests/run-make-fulldeps/invalid-staticlib/Makefile rename to tests/run-make/invalid-staticlib/Makefile diff --git a/tests/run-make/issue-10971-temps-dir/Makefile b/tests/run-make/issue-10971-temps-dir/Makefile index e589bbffe60b9..6e1649a58d231 100644 --- a/tests/run-make/issue-10971-temps-dir/Makefile +++ b/tests/run-make/issue-10971-temps-dir/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # Regression test for issue #10971 # Running two invocations in parallel would overwrite each other's temp files. diff --git a/tests/run-make-fulldeps/issue-11908/Makefile b/tests/run-make/issue-11908/Makefile similarity index 96% rename from tests/run-make-fulldeps/issue-11908/Makefile rename to tests/run-make/issue-11908/Makefile index 47005537e41af..38586662fc75b 100644 --- a/tests/run-make-fulldeps/issue-11908/Makefile +++ b/tests/run-make/issue-11908/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile # This test ensures that if you have the same rlib or dylib at two locations # in the same path that you don't hit an assertion in the compiler. # diff --git a/tests/run-make-fulldeps/issue-11908/bar.rs b/tests/run-make/issue-11908/bar.rs similarity index 100% rename from tests/run-make-fulldeps/issue-11908/bar.rs rename to tests/run-make/issue-11908/bar.rs diff --git a/tests/run-make-fulldeps/issue-11908/foo.rs b/tests/run-make/issue-11908/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-11908/foo.rs rename to tests/run-make/issue-11908/foo.rs diff --git a/tests/run-make-fulldeps/issue-14500/Makefile b/tests/run-make/issue-14500/Makefile similarity index 96% rename from tests/run-make-fulldeps/issue-14500/Makefile rename to tests/run-make/issue-14500/Makefile index 52550e57018e4..eeab48de3b950 100644 --- a/tests/run-make-fulldeps/issue-14500/Makefile +++ b/tests/run-make/issue-14500/Makefile @@ -1,5 +1,7 @@ include ../tools.mk +# ignore-cross-compile + # Test to make sure that reachable extern fns are always available in final # productcs, including when LTO is used. In this test, the `foo` crate has a # reahable symbol, and is a dependency of the `bar` crate. When the `bar` crate diff --git a/tests/run-make-fulldeps/issue-14500/bar.rs b/tests/run-make/issue-14500/bar.rs similarity index 100% rename from tests/run-make-fulldeps/issue-14500/bar.rs rename to tests/run-make/issue-14500/bar.rs diff --git a/tests/run-make-fulldeps/issue-14500/foo.c b/tests/run-make/issue-14500/foo.c similarity index 100% rename from tests/run-make-fulldeps/issue-14500/foo.c rename to tests/run-make/issue-14500/foo.c diff --git a/tests/run-make-fulldeps/issue-14500/foo.rs b/tests/run-make/issue-14500/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-14500/foo.rs rename to tests/run-make/issue-14500/foo.rs diff --git a/tests/run-make-fulldeps/issue-14698/Makefile b/tests/run-make/issue-14698/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-14698/Makefile rename to tests/run-make/issue-14698/Makefile diff --git a/tests/run-make-fulldeps/issue-14698/foo.rs b/tests/run-make/issue-14698/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-14698/foo.rs rename to tests/run-make/issue-14698/foo.rs diff --git a/tests/run-make-fulldeps/issue-15460/Makefile b/tests/run-make/issue-15460/Makefile similarity index 86% rename from tests/run-make-fulldeps/issue-15460/Makefile rename to tests/run-make/issue-15460/Makefile index 1648d0c0c9b84..a36a085fa6f18 100644 --- a/tests/run-make-fulldeps/issue-15460/Makefile +++ b/tests/run-make/issue-15460/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,foo) diff --git a/tests/run-make-fulldeps/issue-15460/bar.rs b/tests/run-make/issue-15460/bar.rs similarity index 100% rename from tests/run-make-fulldeps/issue-15460/bar.rs rename to tests/run-make/issue-15460/bar.rs diff --git a/tests/run-make-fulldeps/issue-15460/foo.c b/tests/run-make/issue-15460/foo.c similarity index 100% rename from tests/run-make-fulldeps/issue-15460/foo.c rename to tests/run-make/issue-15460/foo.c diff --git a/tests/run-make-fulldeps/issue-15460/foo.rs b/tests/run-make/issue-15460/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-15460/foo.rs rename to tests/run-make/issue-15460/foo.rs diff --git a/tests/run-make-fulldeps/issue-18943/Makefile b/tests/run-make/issue-18943/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-18943/Makefile rename to tests/run-make/issue-18943/Makefile diff --git a/tests/run-make-fulldeps/issue-18943/foo.rs b/tests/run-make/issue-18943/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-18943/foo.rs rename to tests/run-make/issue-18943/foo.rs diff --git a/tests/run-make-fulldeps/issue-20626/Makefile b/tests/run-make/issue-20626/Makefile similarity index 88% rename from tests/run-make-fulldeps/issue-20626/Makefile rename to tests/run-make/issue-20626/Makefile index f76f31e794af1..63eee910a9c3a 100644 --- a/tests/run-make-fulldeps/issue-20626/Makefile +++ b/tests/run-make/issue-20626/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Test output to be four diff --git a/tests/run-make-fulldeps/issue-20626/foo.rs b/tests/run-make/issue-20626/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-20626/foo.rs rename to tests/run-make/issue-20626/foo.rs diff --git a/tests/run-make-fulldeps/issue-22131/Makefile b/tests/run-make/issue-22131/Makefile similarity index 89% rename from tests/run-make-fulldeps/issue-22131/Makefile rename to tests/run-make/issue-22131/Makefile index 770f4b04ec358..4f33a4659cc1e 100644 --- a/tests/run-make-fulldeps/issue-22131/Makefile +++ b/tests/run-make/issue-22131/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: foo.rs diff --git a/tests/run-make-fulldeps/issue-22131/foo.rs b/tests/run-make/issue-22131/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-22131/foo.rs rename to tests/run-make/issue-22131/foo.rs diff --git a/tests/run-make-fulldeps/issue-24445/Makefile b/tests/run-make/issue-24445/Makefile similarity index 92% rename from tests/run-make-fulldeps/issue-24445/Makefile rename to tests/run-make/issue-24445/Makefile index 2a12226a6c037..a13910aa73ed0 100644 --- a/tests/run-make-fulldeps/issue-24445/Makefile +++ b/tests/run-make/issue-24445/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # only-linux diff --git a/tests/run-make-fulldeps/issue-24445/foo.c b/tests/run-make/issue-24445/foo.c similarity index 100% rename from tests/run-make-fulldeps/issue-24445/foo.c rename to tests/run-make/issue-24445/foo.c diff --git a/tests/run-make-fulldeps/issue-24445/foo.rs b/tests/run-make/issue-24445/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-24445/foo.rs rename to tests/run-make/issue-24445/foo.rs diff --git a/tests/run-make/issue-25581/Makefile b/tests/run-make/issue-25581/Makefile new file mode 100644 index 0000000000000..3cbbf3839969f --- /dev/null +++ b/tests/run-make/issue-25581/Makefile @@ -0,0 +1,6 @@ +# ignore-cross-compile +include ../tools.mk + +all: $(call NATIVE_STATICLIB,test) + $(RUSTC) test.rs + $(call RUN,test) || exit 1 diff --git a/tests/run-make-fulldeps/issue-25581/test.c b/tests/run-make/issue-25581/test.c similarity index 100% rename from tests/run-make-fulldeps/issue-25581/test.c rename to tests/run-make/issue-25581/test.c diff --git a/tests/run-make-fulldeps/issue-25581/test.rs b/tests/run-make/issue-25581/test.rs similarity index 100% rename from tests/run-make-fulldeps/issue-25581/test.rs rename to tests/run-make/issue-25581/test.rs diff --git a/tests/run-make-fulldeps/issue-26006/Makefile b/tests/run-make/issue-26006/Makefile similarity index 93% rename from tests/run-make-fulldeps/issue-26006/Makefile rename to tests/run-make/issue-26006/Makefile index 0ff0730200250..b679c121530ad 100644 --- a/tests/run-make-fulldeps/issue-26006/Makefile +++ b/tests/run-make/issue-26006/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-windows diff --git a/tests/run-make-fulldeps/issue-26006/in/libc/lib.rs b/tests/run-make/issue-26006/in/libc/lib.rs similarity index 100% rename from tests/run-make-fulldeps/issue-26006/in/libc/lib.rs rename to tests/run-make/issue-26006/in/libc/lib.rs diff --git a/tests/run-make-fulldeps/issue-26006/in/time/lib.rs b/tests/run-make/issue-26006/in/time/lib.rs similarity index 100% rename from tests/run-make-fulldeps/issue-26006/in/time/lib.rs rename to tests/run-make/issue-26006/in/time/lib.rs diff --git a/tests/run-make-fulldeps/issue-26092/Makefile b/tests/run-make/issue-26092/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-26092/Makefile rename to tests/run-make/issue-26092/Makefile diff --git a/tests/run-make-fulldeps/issue-26092/blank.rs b/tests/run-make/issue-26092/blank.rs similarity index 100% rename from tests/run-make-fulldeps/issue-26092/blank.rs rename to tests/run-make/issue-26092/blank.rs diff --git a/tests/run-make-fulldeps/issue-28595/Makefile b/tests/run-make/issue-28595/Makefile similarity index 84% rename from tests/run-make-fulldeps/issue-28595/Makefile rename to tests/run-make/issue-28595/Makefile index 30a1d9c560a96..258f9788aafa7 100644 --- a/tests/run-make-fulldeps/issue-28595/Makefile +++ b/tests/run-make/issue-28595/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,a) $(call NATIVE_STATICLIB,b) diff --git a/tests/run-make-fulldeps/issue-28595/a.c b/tests/run-make/issue-28595/a.c similarity index 100% rename from tests/run-make-fulldeps/issue-28595/a.c rename to tests/run-make/issue-28595/a.c diff --git a/tests/run-make-fulldeps/issue-28595/a.rs b/tests/run-make/issue-28595/a.rs similarity index 100% rename from tests/run-make-fulldeps/issue-28595/a.rs rename to tests/run-make/issue-28595/a.rs diff --git a/tests/run-make-fulldeps/issue-28595/b.c b/tests/run-make/issue-28595/b.c similarity index 100% rename from tests/run-make-fulldeps/issue-28595/b.c rename to tests/run-make/issue-28595/b.c diff --git a/tests/run-make-fulldeps/issue-28595/b.rs b/tests/run-make/issue-28595/b.rs similarity index 100% rename from tests/run-make-fulldeps/issue-28595/b.rs rename to tests/run-make/issue-28595/b.rs diff --git a/tests/run-make-fulldeps/issue-28766/Makefile b/tests/run-make/issue-28766/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-28766/Makefile rename to tests/run-make/issue-28766/Makefile diff --git a/tests/run-make-fulldeps/issue-28766/foo.rs b/tests/run-make/issue-28766/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-28766/foo.rs rename to tests/run-make/issue-28766/foo.rs diff --git a/tests/run-make-fulldeps/issue-28766/main.rs b/tests/run-make/issue-28766/main.rs similarity index 100% rename from tests/run-make-fulldeps/issue-28766/main.rs rename to tests/run-make/issue-28766/main.rs diff --git a/tests/run-make-fulldeps/issue-30063/Makefile b/tests/run-make/issue-30063/Makefile similarity index 97% rename from tests/run-make-fulldeps/issue-30063/Makefile rename to tests/run-make/issue-30063/Makefile index e4ede598f7be8..8a69ca79f5150 100644 --- a/tests/run-make-fulldeps/issue-30063/Makefile +++ b/tests/run-make/issue-30063/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/issue-30063/foo.rs b/tests/run-make/issue-30063/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-30063/foo.rs rename to tests/run-make/issue-30063/foo.rs diff --git a/tests/run-make-fulldeps/issue-33329/Makefile b/tests/run-make/issue-33329/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-33329/Makefile rename to tests/run-make/issue-33329/Makefile diff --git a/tests/run-make-fulldeps/issue-33329/main.rs b/tests/run-make/issue-33329/main.rs similarity index 100% rename from tests/run-make-fulldeps/issue-33329/main.rs rename to tests/run-make/issue-33329/main.rs diff --git a/tests/run-make-fulldeps/issue-35164/Makefile b/tests/run-make/issue-35164/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-35164/Makefile rename to tests/run-make/issue-35164/Makefile diff --git a/tests/run-make-fulldeps/issue-35164/main.rs b/tests/run-make/issue-35164/main.rs similarity index 100% rename from tests/run-make-fulldeps/issue-35164/main.rs rename to tests/run-make/issue-35164/main.rs diff --git a/tests/run-make-fulldeps/issue-35164/submodule/mod.rs b/tests/run-make/issue-35164/submodule/mod.rs similarity index 100% rename from tests/run-make-fulldeps/issue-35164/submodule/mod.rs rename to tests/run-make/issue-35164/submodule/mod.rs diff --git a/tests/run-make/issue-36710/Makefile b/tests/run-make/issue-36710/Makefile index c6b71f5fbd49f..7b91107a23495 100644 --- a/tests/run-make/issue-36710/Makefile +++ b/tests/run-make/issue-36710/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile # ignore-none no-std is not supported # ignore-wasm32 FIXME: don't attempt to compile C++ to WASM # ignore-wasm64 FIXME: don't attempt to compile C++ to WASM @@ -6,7 +7,7 @@ # (see dist-i586-gnu-i586-i686-musl Dockerfile) # ignore-sgx -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: foo $(call RUN,foo) diff --git a/tests/run-make-fulldeps/issue-37839/Makefile b/tests/run-make/issue-37839/Makefile similarity index 87% rename from tests/run-make-fulldeps/issue-37839/Makefile rename to tests/run-make/issue-37839/Makefile index de50bd7137968..6bad27b7bdcd2 100644 --- a/tests/run-make-fulldeps/issue-37839/Makefile +++ b/tests/run-make/issue-37839/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/issue-37839/a.rs b/tests/run-make/issue-37839/a.rs similarity index 100% rename from tests/run-make-fulldeps/issue-37839/a.rs rename to tests/run-make/issue-37839/a.rs diff --git a/tests/run-make-fulldeps/issue-37839/b.rs b/tests/run-make/issue-37839/b.rs similarity index 100% rename from tests/run-make-fulldeps/issue-37839/b.rs rename to tests/run-make/issue-37839/b.rs diff --git a/tests/run-make-fulldeps/issue-37839/c.rs b/tests/run-make/issue-37839/c.rs similarity index 100% rename from tests/run-make-fulldeps/issue-37839/c.rs rename to tests/run-make/issue-37839/c.rs diff --git a/tests/run-make-fulldeps/issue-37893/Makefile b/tests/run-make/issue-37893/Makefile similarity index 76% rename from tests/run-make-fulldeps/issue-37893/Makefile rename to tests/run-make/issue-37893/Makefile index 33a60830e5d19..44e4a321a30a5 100644 --- a/tests/run-make-fulldeps/issue-37893/Makefile +++ b/tests/run-make/issue-37893/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/issue-37893/a.rs b/tests/run-make/issue-37893/a.rs similarity index 100% rename from tests/run-make-fulldeps/issue-37893/a.rs rename to tests/run-make/issue-37893/a.rs diff --git a/tests/run-make-fulldeps/issue-37893/b.rs b/tests/run-make/issue-37893/b.rs similarity index 100% rename from tests/run-make-fulldeps/issue-37893/b.rs rename to tests/run-make/issue-37893/b.rs diff --git a/tests/run-make-fulldeps/issue-37893/c.rs b/tests/run-make/issue-37893/c.rs similarity index 100% rename from tests/run-make-fulldeps/issue-37893/c.rs rename to tests/run-make/issue-37893/c.rs diff --git a/tests/run-make-fulldeps/issue-38237/Makefile b/tests/run-make/issue-38237/Makefile similarity index 82% rename from tests/run-make-fulldeps/issue-38237/Makefile rename to tests/run-make/issue-38237/Makefile index 75121d0401243..80dddc5bd1331 100644 --- a/tests/run-make-fulldeps/issue-38237/Makefile +++ b/tests/run-make/issue-38237/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/issue-38237/bar.rs b/tests/run-make/issue-38237/bar.rs similarity index 100% rename from tests/run-make-fulldeps/issue-38237/bar.rs rename to tests/run-make/issue-38237/bar.rs diff --git a/tests/run-make-fulldeps/issue-38237/baz.rs b/tests/run-make/issue-38237/baz.rs similarity index 100% rename from tests/run-make-fulldeps/issue-38237/baz.rs rename to tests/run-make/issue-38237/baz.rs diff --git a/tests/run-make-fulldeps/issue-38237/foo.rs b/tests/run-make/issue-38237/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-38237/foo.rs rename to tests/run-make/issue-38237/foo.rs diff --git a/tests/run-make-fulldeps/issue-40535/Makefile b/tests/run-make/issue-40535/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-40535/Makefile rename to tests/run-make/issue-40535/Makefile diff --git a/tests/run-make-fulldeps/issue-40535/bar.rs b/tests/run-make/issue-40535/bar.rs similarity index 100% rename from tests/run-make-fulldeps/issue-40535/bar.rs rename to tests/run-make/issue-40535/bar.rs diff --git a/tests/run-make-fulldeps/issue-40535/baz.rs b/tests/run-make/issue-40535/baz.rs similarity index 100% rename from tests/run-make-fulldeps/issue-40535/baz.rs rename to tests/run-make/issue-40535/baz.rs diff --git a/tests/run-make-fulldeps/issue-40535/foo.rs b/tests/run-make/issue-40535/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-40535/foo.rs rename to tests/run-make/issue-40535/foo.rs diff --git a/tests/run-make-fulldeps/issue-46239/Makefile b/tests/run-make/issue-46239/Makefile similarity index 77% rename from tests/run-make-fulldeps/issue-46239/Makefile rename to tests/run-make/issue-46239/Makefile index a93ef32129846..0006ced25156a 100644 --- a/tests/run-make-fulldeps/issue-46239/Makefile +++ b/tests/run-make/issue-46239/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/issue-46239/main.rs b/tests/run-make/issue-46239/main.rs similarity index 100% rename from tests/run-make-fulldeps/issue-46239/main.rs rename to tests/run-make/issue-46239/main.rs diff --git a/tests/run-make/issue-47384/Makefile b/tests/run-make/issue-47384/Makefile index 0aadf6c88c98f..afc77cb275aaa 100644 --- a/tests/run-make/issue-47384/Makefile +++ b/tests/run-make/issue-47384/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-linux # ignore-cross-compile diff --git a/tests/run-make-fulldeps/issue-47551/Makefile b/tests/run-make/issue-47551/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-47551/Makefile rename to tests/run-make/issue-47551/Makefile diff --git a/tests/run-make-fulldeps/issue-47551/eh_frame-terminator.rs b/tests/run-make/issue-47551/eh_frame-terminator.rs similarity index 100% rename from tests/run-make-fulldeps/issue-47551/eh_frame-terminator.rs rename to tests/run-make/issue-47551/eh_frame-terminator.rs diff --git a/tests/run-make-fulldeps/issue-51671/Makefile b/tests/run-make/issue-51671/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-51671/Makefile rename to tests/run-make/issue-51671/Makefile diff --git a/tests/run-make-fulldeps/issue-51671/app.rs b/tests/run-make/issue-51671/app.rs similarity index 100% rename from tests/run-make-fulldeps/issue-51671/app.rs rename to tests/run-make/issue-51671/app.rs diff --git a/tests/run-make-fulldeps/issue-53964/Makefile b/tests/run-make/issue-53964/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-53964/Makefile rename to tests/run-make/issue-53964/Makefile diff --git a/tests/run-make-fulldeps/issue-53964/app.rs b/tests/run-make/issue-53964/app.rs similarity index 100% rename from tests/run-make-fulldeps/issue-53964/app.rs rename to tests/run-make/issue-53964/app.rs diff --git a/tests/run-make-fulldeps/issue-53964/panic.rs b/tests/run-make/issue-53964/panic.rs similarity index 100% rename from tests/run-make-fulldeps/issue-53964/panic.rs rename to tests/run-make/issue-53964/panic.rs diff --git a/tests/run-make-fulldeps/issue-64153/Makefile b/tests/run-make/issue-64153/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-64153/Makefile rename to tests/run-make/issue-64153/Makefile diff --git a/tests/run-make-fulldeps/issue-64153/downstream.rs b/tests/run-make/issue-64153/downstream.rs similarity index 100% rename from tests/run-make-fulldeps/issue-64153/downstream.rs rename to tests/run-make/issue-64153/downstream.rs diff --git a/tests/run-make-fulldeps/issue-64153/upstream.rs b/tests/run-make/issue-64153/upstream.rs similarity index 100% rename from tests/run-make-fulldeps/issue-64153/upstream.rs rename to tests/run-make/issue-64153/upstream.rs diff --git a/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile b/tests/run-make/issue-68794-textrel-on-minimal-lib/Makefile similarity index 95% rename from tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile rename to tests/run-make/issue-68794-textrel-on-minimal-lib/Makefile index 13983f4ffe03a..6140b39c0e2aa 100644 --- a/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile +++ b/tests/run-make/issue-68794-textrel-on-minimal-lib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile # Regression test for issue #68794 # # Verify that no text relocations are accidentally introduced by linking a diff --git a/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/bar.c b/tests/run-make/issue-68794-textrel-on-minimal-lib/bar.c similarity index 100% rename from tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/bar.c rename to tests/run-make/issue-68794-textrel-on-minimal-lib/bar.c diff --git a/tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/foo.rs b/tests/run-make/issue-68794-textrel-on-minimal-lib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/foo.rs rename to tests/run-make/issue-68794-textrel-on-minimal-lib/foo.rs diff --git a/tests/run-make-fulldeps/issue-69368/Makefile b/tests/run-make/issue-69368/Makefile similarity index 95% rename from tests/run-make-fulldeps/issue-69368/Makefile rename to tests/run-make/issue-69368/Makefile index 41770475db04e..b1229d1b07fc7 100644 --- a/tests/run-make-fulldeps/issue-69368/Makefile +++ b/tests/run-make/issue-69368/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Test that previously triggered a linker failure with root cause diff --git a/tests/run-make-fulldeps/issue-69368/a.rs b/tests/run-make/issue-69368/a.rs similarity index 100% rename from tests/run-make-fulldeps/issue-69368/a.rs rename to tests/run-make/issue-69368/a.rs diff --git a/tests/run-make-fulldeps/issue-69368/b.rs b/tests/run-make/issue-69368/b.rs similarity index 100% rename from tests/run-make-fulldeps/issue-69368/b.rs rename to tests/run-make/issue-69368/b.rs diff --git a/tests/run-make-fulldeps/issue-69368/c.rs b/tests/run-make/issue-69368/c.rs similarity index 100% rename from tests/run-make-fulldeps/issue-69368/c.rs rename to tests/run-make/issue-69368/c.rs diff --git a/tests/run-make/issue-71519/Makefile b/tests/run-make/issue-71519/Makefile index 57497f5205384..0ee83328bb689 100644 --- a/tests/run-make/issue-71519/Makefile +++ b/tests/run-make/issue-71519/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # ignore-msvc # needs-rust-lld diff --git a/tests/run-make-fulldeps/issue-7349/Makefile b/tests/run-make/issue-7349/Makefile similarity index 100% rename from tests/run-make-fulldeps/issue-7349/Makefile rename to tests/run-make/issue-7349/Makefile diff --git a/tests/run-make-fulldeps/issue-7349/foo.rs b/tests/run-make/issue-7349/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue-7349/foo.rs rename to tests/run-make/issue-7349/foo.rs diff --git a/tests/run-make-fulldeps/issue-83045/Makefile b/tests/run-make/issue-83045/Makefile similarity index 96% rename from tests/run-make-fulldeps/issue-83045/Makefile rename to tests/run-make/issue-83045/Makefile index fc180ccfe28e2..7053da00f6b10 100644 --- a/tests/run-make-fulldeps/issue-83045/Makefile +++ b/tests/run-make/issue-83045/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # This test case creates a situation where the crate loader would run # into an ICE when confronted with an invalid setup where it cannot diff --git a/tests/run-make-fulldeps/issue-83045/a.rs b/tests/run-make/issue-83045/a.rs similarity index 100% rename from tests/run-make-fulldeps/issue-83045/a.rs rename to tests/run-make/issue-83045/a.rs diff --git a/tests/run-make-fulldeps/issue-83045/b.rs b/tests/run-make/issue-83045/b.rs similarity index 100% rename from tests/run-make-fulldeps/issue-83045/b.rs rename to tests/run-make/issue-83045/b.rs diff --git a/tests/run-make-fulldeps/issue-83045/c.rs b/tests/run-make/issue-83045/c.rs similarity index 100% rename from tests/run-make-fulldeps/issue-83045/c.rs rename to tests/run-make/issue-83045/c.rs diff --git a/tests/run-make/issue-83112-incr-test-moved-file/Makefile b/tests/run-make/issue-83112-incr-test-moved-file/Makefile index 2f796e5b2fc07..a00088cd9d61b 100644 --- a/tests/run-make/issue-83112-incr-test-moved-file/Makefile +++ b/tests/run-make/issue-83112-incr-test-moved-file/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # ignore-none no-std is not supported # ignore-nvptx64-nvidia-cuda FIXME: can't find crate for 'std' diff --git a/tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile b/tests/run-make/issue-84395-lto-embed-bitcode/Makefile similarity index 91% rename from tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile rename to tests/run-make/issue-84395-lto-embed-bitcode/Makefile index 879ce174339a6..95c8d08a18bc7 100644 --- a/tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile +++ b/tests/run-make/issue-84395-lto-embed-bitcode/Makefile @@ -3,7 +3,7 @@ # This test makes sure the embed bitcode in elf created with # lto-embed-bitcode=optimized is valid llvm BC module. -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) test.rs --target $(TARGET) -Clink-arg=-fuse-ld=lld -Clinker-plugin-lto -Clinker=$(CLANG) -Clink-arg=-Wl,--plugin-opt=-lto-embed-bitcode=optimized -Zemit-thin-lto=no diff --git a/tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/test.rs b/tests/run-make/issue-84395-lto-embed-bitcode/test.rs similarity index 100% rename from tests/run-make-fulldeps/issue-84395-lto-embed-bitcode/test.rs rename to tests/run-make/issue-84395-lto-embed-bitcode/test.rs diff --git a/tests/run-make/issue-85019-moved-src-dir/Makefile b/tests/run-make/issue-85019-moved-src-dir/Makefile index 3606d4fdf57ce..dec289058f936 100644 --- a/tests/run-make/issue-85019-moved-src-dir/Makefile +++ b/tests/run-make/issue-85019-moved-src-dir/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk INCR=$(TMPDIR)/incr FIRST_SRC=$(TMPDIR)/first_src diff --git a/tests/run-make/issue-85401-static-mir/Makefile b/tests/run-make/issue-85401-static-mir/Makefile index 99590166bca3e..47a36b6e45355 100644 --- a/tests/run-make/issue-85401-static-mir/Makefile +++ b/tests/run-make/issue-85401-static-mir/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # Regression test for issue #85401 # Verify that we do not ICE when trying to access MIR for statics, diff --git a/tests/run-make/issue-85441/Makefile b/tests/run-make/issue-85441/Makefile index f04b07d51fa63..987d7f7d4a76f 100644 --- a/tests/run-make/issue-85441/Makefile +++ b/tests/run-make/issue-85441/Makefile @@ -1,6 +1,6 @@ # only-windows-msvc -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # Tests that WS2_32.dll is not unnecessarily linked, see issue #85441 diff --git a/tests/run-make/issue-88756-default-output/Makefile b/tests/run-make/issue-88756-default-output/Makefile index 275c35c262935..d1c3d0fe08249 100644 --- a/tests/run-make/issue-88756-default-output/Makefile +++ b/tests/run-make/issue-88756-default-output/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(BARE_RUSTDOC) 2>&1 | sed -E 's@/nightly/|/beta/|/stable/|/1\.[0-9]+\.[0-9]+/@/$$CHANNEL/@g' | diff - output-default.stdout diff --git a/tests/run-make/issue-96498/Makefile b/tests/run-make/issue-96498/Makefile index ce2b1b1ff7c3d..efdd328c671ed 100644 --- a/tests/run-make/issue-96498/Makefile +++ b/tests/run-make/issue-96498/Makefile @@ -1,7 +1,7 @@ # only-windows # needs-rust-lld -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # Ensure that LLD can link all: diff --git a/tests/run-make-fulldeps/issue-97463-abi-param-passing/Makefile b/tests/run-make/issue-97463-abi-param-passing/Makefile similarity index 91% rename from tests/run-make-fulldeps/issue-97463-abi-param-passing/Makefile rename to tests/run-make/issue-97463-abi-param-passing/Makefile index db1b53e152eae..7ce7aaeec57a0 100644 --- a/tests/run-make-fulldeps/issue-97463-abi-param-passing/Makefile +++ b/tests/run-make/issue-97463-abi-param-passing/Makefile @@ -1,4 +1,5 @@ --include ../tools.mk +# ignore-cross-compile +include ../tools.mk # ignore-msvc diff --git a/tests/run-make-fulldeps/issue-97463-abi-param-passing/bad.c b/tests/run-make/issue-97463-abi-param-passing/bad.c similarity index 100% rename from tests/run-make-fulldeps/issue-97463-abi-param-passing/bad.c rename to tests/run-make/issue-97463-abi-param-passing/bad.c diff --git a/tests/run-make-fulldeps/issue-97463-abi-param-passing/param_passing.rs b/tests/run-make/issue-97463-abi-param-passing/param_passing.rs similarity index 100% rename from tests/run-make-fulldeps/issue-97463-abi-param-passing/param_passing.rs rename to tests/run-make/issue-97463-abi-param-passing/param_passing.rs diff --git a/tests/run-make-fulldeps/issue64319/Makefile b/tests/run-make/issue64319/Makefile similarity index 97% rename from tests/run-make-fulldeps/issue64319/Makefile rename to tests/run-make/issue64319/Makefile index ee0d177abc986..56346cbcc154c 100644 --- a/tests/run-make-fulldeps/issue64319/Makefile +++ b/tests/run-make/issue64319/Makefile @@ -1,4 +1,5 @@ -include ../../run-make-fulldeps/tools.mk +# ignore-cross-compile +include ../tools.mk # Different optimization levels imply different values for `-Zshare-generics`, # so try out a whole bunch of combinations to make sure everything is compatible diff --git a/tests/run-make-fulldeps/issue64319/bar.rs b/tests/run-make/issue64319/bar.rs similarity index 100% rename from tests/run-make-fulldeps/issue64319/bar.rs rename to tests/run-make/issue64319/bar.rs diff --git a/tests/run-make-fulldeps/issue64319/foo.rs b/tests/run-make/issue64319/foo.rs similarity index 100% rename from tests/run-make-fulldeps/issue64319/foo.rs rename to tests/run-make/issue64319/foo.rs diff --git a/tests/run-make/jobserver-error/Makefile b/tests/run-make/jobserver-error/Makefile index 3b9104fc35484..39946ae5edbfa 100644 --- a/tests/run-make/jobserver-error/Makefile +++ b/tests/run-make/jobserver-error/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-linux diff --git a/tests/run-make-fulldeps/libs-through-symlinks/Makefile b/tests/run-make/libs-through-symlinks/Makefile similarity index 91% rename from tests/run-make-fulldeps/libs-through-symlinks/Makefile rename to tests/run-make/libs-through-symlinks/Makefile index 45deaecb8406a..592eae663a49a 100644 --- a/tests/run-make-fulldeps/libs-through-symlinks/Makefile +++ b/tests/run-make/libs-through-symlinks/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-windows diff --git a/tests/run-make-fulldeps/libs-through-symlinks/bar.rs b/tests/run-make/libs-through-symlinks/bar.rs similarity index 100% rename from tests/run-make-fulldeps/libs-through-symlinks/bar.rs rename to tests/run-make/libs-through-symlinks/bar.rs diff --git a/tests/run-make-fulldeps/libs-through-symlinks/foo.rs b/tests/run-make/libs-through-symlinks/foo.rs similarity index 100% rename from tests/run-make-fulldeps/libs-through-symlinks/foo.rs rename to tests/run-make/libs-through-symlinks/foo.rs diff --git a/tests/run-make-fulldeps/libtest-json/Makefile b/tests/run-make/libtest-json/Makefile similarity index 97% rename from tests/run-make-fulldeps/libtest-json/Makefile rename to tests/run-make/libtest-json/Makefile index 37b6cb9e2d4d5..417637cf07276 100644 --- a/tests/run-make-fulldeps/libtest-json/Makefile +++ b/tests/run-make/libtest-json/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Test expected libtest's JSON output diff --git a/tests/run-make-fulldeps/libtest-json/f.rs b/tests/run-make/libtest-json/f.rs similarity index 100% rename from tests/run-make-fulldeps/libtest-json/f.rs rename to tests/run-make/libtest-json/f.rs diff --git a/tests/run-make-fulldeps/libtest-json/output-default.json b/tests/run-make/libtest-json/output-default.json similarity index 100% rename from tests/run-make-fulldeps/libtest-json/output-default.json rename to tests/run-make/libtest-json/output-default.json diff --git a/tests/run-make-fulldeps/libtest-json/output-stdout-success.json b/tests/run-make/libtest-json/output-stdout-success.json similarity index 100% rename from tests/run-make-fulldeps/libtest-json/output-stdout-success.json rename to tests/run-make/libtest-json/output-stdout-success.json diff --git a/tests/run-make-fulldeps/libtest-json/validate_json.py b/tests/run-make/libtest-json/validate_json.py similarity index 100% rename from tests/run-make-fulldeps/libtest-json/validate_json.py rename to tests/run-make/libtest-json/validate_json.py diff --git a/tests/run-make/libtest-thread-limit/Makefile b/tests/run-make/libtest-thread-limit/Makefile index d43a89e60cab8..9496fa30159a6 100644 --- a/tests/run-make/libtest-thread-limit/Makefile +++ b/tests/run-make/libtest-thread-limit/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-linux diff --git a/tests/run-make-fulldeps/link-arg/Makefile b/tests/run-make/link-arg/Makefile similarity index 100% rename from tests/run-make-fulldeps/link-arg/Makefile rename to tests/run-make/link-arg/Makefile diff --git a/tests/run-make-fulldeps/link-arg/empty.rs b/tests/run-make/link-arg/empty.rs similarity index 100% rename from tests/run-make-fulldeps/link-arg/empty.rs rename to tests/run-make/link-arg/empty.rs diff --git a/tests/run-make-fulldeps/link-args-order/Makefile b/tests/run-make/link-args-order/Makefile similarity index 100% rename from tests/run-make-fulldeps/link-args-order/Makefile rename to tests/run-make/link-args-order/Makefile diff --git a/tests/run-make-fulldeps/link-args-order/empty.rs b/tests/run-make/link-args-order/empty.rs similarity index 100% rename from tests/run-make-fulldeps/link-args-order/empty.rs rename to tests/run-make/link-args-order/empty.rs diff --git a/tests/run-make-fulldeps/link-cfg/Makefile b/tests/run-make/link-cfg/Makefile similarity index 96% rename from tests/run-make-fulldeps/link-cfg/Makefile rename to tests/run-make/link-cfg/Makefile index 0b25ccded0694..a40997011443c 100644 --- a/tests/run-make-fulldeps/link-cfg/Makefile +++ b/tests/run-make/link-cfg/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call DYLIB,return1) $(call DYLIB,return2) $(call NATIVE_STATICLIB,return3) diff --git a/tests/run-make-fulldeps/link-cfg/dep-with-staticlib.rs b/tests/run-make/link-cfg/dep-with-staticlib.rs similarity index 100% rename from tests/run-make-fulldeps/link-cfg/dep-with-staticlib.rs rename to tests/run-make/link-cfg/dep-with-staticlib.rs diff --git a/tests/run-make-fulldeps/link-cfg/dep.rs b/tests/run-make/link-cfg/dep.rs similarity index 100% rename from tests/run-make-fulldeps/link-cfg/dep.rs rename to tests/run-make/link-cfg/dep.rs diff --git a/tests/run-make-fulldeps/link-cfg/no-deps.rs b/tests/run-make/link-cfg/no-deps.rs similarity index 100% rename from tests/run-make-fulldeps/link-cfg/no-deps.rs rename to tests/run-make/link-cfg/no-deps.rs diff --git a/tests/run-make-fulldeps/link-cfg/return1.c b/tests/run-make/link-cfg/return1.c similarity index 100% rename from tests/run-make-fulldeps/link-cfg/return1.c rename to tests/run-make/link-cfg/return1.c diff --git a/tests/run-make-fulldeps/link-cfg/return2.c b/tests/run-make/link-cfg/return2.c similarity index 100% rename from tests/run-make-fulldeps/link-cfg/return2.c rename to tests/run-make/link-cfg/return2.c diff --git a/tests/run-make-fulldeps/link-cfg/return3.c b/tests/run-make/link-cfg/return3.c similarity index 100% rename from tests/run-make-fulldeps/link-cfg/return3.c rename to tests/run-make/link-cfg/return3.c diff --git a/tests/run-make-fulldeps/link-cfg/with-deps.rs b/tests/run-make/link-cfg/with-deps.rs similarity index 100% rename from tests/run-make-fulldeps/link-cfg/with-deps.rs rename to tests/run-make/link-cfg/with-deps.rs diff --git a/tests/run-make-fulldeps/link-cfg/with-staticlib-deps.rs b/tests/run-make/link-cfg/with-staticlib-deps.rs similarity index 100% rename from tests/run-make-fulldeps/link-cfg/with-staticlib-deps.rs rename to tests/run-make/link-cfg/with-staticlib-deps.rs diff --git a/tests/run-make-fulldeps/link-dedup/Makefile b/tests/run-make/link-dedup/Makefile similarity index 100% rename from tests/run-make-fulldeps/link-dedup/Makefile rename to tests/run-make/link-dedup/Makefile diff --git a/tests/run-make-fulldeps/link-dedup/depa.rs b/tests/run-make/link-dedup/depa.rs similarity index 100% rename from tests/run-make-fulldeps/link-dedup/depa.rs rename to tests/run-make/link-dedup/depa.rs diff --git a/tests/run-make-fulldeps/link-dedup/depb.rs b/tests/run-make/link-dedup/depb.rs similarity index 100% rename from tests/run-make-fulldeps/link-dedup/depb.rs rename to tests/run-make/link-dedup/depb.rs diff --git a/tests/run-make-fulldeps/link-dedup/depc.rs b/tests/run-make/link-dedup/depc.rs similarity index 100% rename from tests/run-make-fulldeps/link-dedup/depc.rs rename to tests/run-make/link-dedup/depc.rs diff --git a/tests/run-make-fulldeps/link-dedup/empty.rs b/tests/run-make/link-dedup/empty.rs similarity index 100% rename from tests/run-make-fulldeps/link-dedup/empty.rs rename to tests/run-make/link-dedup/empty.rs diff --git a/tests/run-make-fulldeps/link-path-order/Makefile b/tests/run-make/link-path-order/Makefile similarity index 96% rename from tests/run-make-fulldeps/link-path-order/Makefile rename to tests/run-make/link-path-order/Makefile index ed7c299e61a77..a3831a63ac7e5 100644 --- a/tests/run-make-fulldeps/link-path-order/Makefile +++ b/tests/run-make/link-path-order/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Verifies that the -L arguments given to the linker is in the same order diff --git a/tests/run-make-fulldeps/link-path-order/correct.c b/tests/run-make/link-path-order/correct.c similarity index 100% rename from tests/run-make-fulldeps/link-path-order/correct.c rename to tests/run-make/link-path-order/correct.c diff --git a/tests/run-make-fulldeps/link-path-order/main.rs b/tests/run-make/link-path-order/main.rs similarity index 100% rename from tests/run-make-fulldeps/link-path-order/main.rs rename to tests/run-make/link-path-order/main.rs diff --git a/tests/run-make-fulldeps/link-path-order/wrong.c b/tests/run-make/link-path-order/wrong.c similarity index 100% rename from tests/run-make-fulldeps/link-path-order/wrong.c rename to tests/run-make/link-path-order/wrong.c diff --git a/tests/run-make-fulldeps/linkage-attr-on-static/Makefile b/tests/run-make/linkage-attr-on-static/Makefile similarity index 81% rename from tests/run-make-fulldeps/linkage-attr-on-static/Makefile rename to tests/run-make/linkage-attr-on-static/Makefile index 7cc54e40a3a80..ef50a7ef9f13c 100644 --- a/tests/run-make-fulldeps/linkage-attr-on-static/Makefile +++ b/tests/run-make/linkage-attr-on-static/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,foo) diff --git a/tests/run-make-fulldeps/linkage-attr-on-static/bar.rs b/tests/run-make/linkage-attr-on-static/bar.rs similarity index 100% rename from tests/run-make-fulldeps/linkage-attr-on-static/bar.rs rename to tests/run-make/linkage-attr-on-static/bar.rs diff --git a/tests/run-make-fulldeps/linkage-attr-on-static/foo.c b/tests/run-make/linkage-attr-on-static/foo.c similarity index 100% rename from tests/run-make-fulldeps/linkage-attr-on-static/foo.c rename to tests/run-make/linkage-attr-on-static/foo.c diff --git a/tests/run-make/llvm-outputs/Makefile b/tests/run-make/llvm-outputs/Makefile index a3f25eba0b2ea..cccf1dd66fb93 100644 --- a/tests/run-make/llvm-outputs/Makefile +++ b/tests/run-make/llvm-outputs/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: echo 'fn main() {}' | $(BARE_RUSTC) - --out-dir=$(TMPDIR)/random_directory_that_does_not_exist_ir/ --emit=llvm-ir diff --git a/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile b/tests/run-make/long-linker-command-lines-cmd-exe/Makefile similarity index 85% rename from tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile rename to tests/run-make/long-linker-command-lines-cmd-exe/Makefile index a38f4fe5dc596..e43aab7f8e0fd 100644 --- a/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile +++ b/tests/run-make/long-linker-command-lines-cmd-exe/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.bat b/tests/run-make/long-linker-command-lines-cmd-exe/foo.bat similarity index 100% rename from tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.bat rename to tests/run-make/long-linker-command-lines-cmd-exe/foo.bat diff --git a/tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs b/tests/run-make/long-linker-command-lines-cmd-exe/foo.rs similarity index 100% rename from tests/run-make-fulldeps/long-linker-command-lines-cmd-exe/foo.rs rename to tests/run-make/long-linker-command-lines-cmd-exe/foo.rs diff --git a/tests/run-make-fulldeps/long-linker-command-lines/Makefile b/tests/run-make/long-linker-command-lines/Makefile similarity index 80% rename from tests/run-make-fulldeps/long-linker-command-lines/Makefile rename to tests/run-make/long-linker-command-lines/Makefile index 00199ca970d3d..f864ea74f4a95 100644 --- a/tests/run-make-fulldeps/long-linker-command-lines/Makefile +++ b/tests/run-make/long-linker-command-lines/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/long-linker-command-lines/foo.rs b/tests/run-make/long-linker-command-lines/foo.rs similarity index 100% rename from tests/run-make-fulldeps/long-linker-command-lines/foo.rs rename to tests/run-make/long-linker-command-lines/foo.rs diff --git a/tests/run-make-fulldeps/longjmp-across-rust/Makefile b/tests/run-make/longjmp-across-rust/Makefile similarity index 79% rename from tests/run-make-fulldeps/longjmp-across-rust/Makefile rename to tests/run-make/longjmp-across-rust/Makefile index 848638d82dd6e..5fd2d4f855ffe 100644 --- a/tests/run-make-fulldeps/longjmp-across-rust/Makefile +++ b/tests/run-make/longjmp-across-rust/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,foo) diff --git a/tests/run-make-fulldeps/longjmp-across-rust/foo.c b/tests/run-make/longjmp-across-rust/foo.c similarity index 100% rename from tests/run-make-fulldeps/longjmp-across-rust/foo.c rename to tests/run-make/longjmp-across-rust/foo.c diff --git a/tests/run-make-fulldeps/longjmp-across-rust/main.rs b/tests/run-make/longjmp-across-rust/main.rs similarity index 100% rename from tests/run-make-fulldeps/longjmp-across-rust/main.rs rename to tests/run-make/longjmp-across-rust/main.rs diff --git a/tests/run-make-fulldeps/ls-metadata/Makefile b/tests/run-make/ls-metadata/Makefile similarity index 84% rename from tests/run-make-fulldeps/ls-metadata/Makefile rename to tests/run-make/ls-metadata/Makefile index e0f916a248e9b..123dd64e15cbd 100644 --- a/tests/run-make-fulldeps/ls-metadata/Makefile +++ b/tests/run-make/ls-metadata/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/ls-metadata/foo.rs b/tests/run-make/ls-metadata/foo.rs similarity index 100% rename from tests/run-make-fulldeps/ls-metadata/foo.rs rename to tests/run-make/ls-metadata/foo.rs diff --git a/tests/run-make-fulldeps/lto-dylib-dep/Makefile b/tests/run-make/lto-dylib-dep/Makefile similarity index 92% rename from tests/run-make-fulldeps/lto-dylib-dep/Makefile rename to tests/run-make/lto-dylib-dep/Makefile index 41487b23c748f..a9344597d081e 100644 --- a/tests/run-make-fulldeps/lto-dylib-dep/Makefile +++ b/tests/run-make/lto-dylib-dep/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Test that we don't run into an assertion when using a Rust dylib dependency diff --git a/tests/run-make-fulldeps/lto-dylib-dep/a_dylib.rs b/tests/run-make/lto-dylib-dep/a_dylib.rs similarity index 100% rename from tests/run-make-fulldeps/lto-dylib-dep/a_dylib.rs rename to tests/run-make/lto-dylib-dep/a_dylib.rs diff --git a/tests/run-make-fulldeps/lto-dylib-dep/main.rs b/tests/run-make/lto-dylib-dep/main.rs similarity index 100% rename from tests/run-make-fulldeps/lto-dylib-dep/main.rs rename to tests/run-make/lto-dylib-dep/main.rs diff --git a/tests/run-make-fulldeps/lto-empty/Makefile b/tests/run-make/lto-empty/Makefile similarity index 94% rename from tests/run-make-fulldeps/lto-empty/Makefile rename to tests/run-make/lto-empty/Makefile index b4345ba188321..1b795c4b73805 100644 --- a/tests/run-make-fulldeps/lto-empty/Makefile +++ b/tests/run-make/lto-empty/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: cdylib-fat cdylib-thin diff --git a/tests/run-make-fulldeps/lto-empty/lib.rs b/tests/run-make/lto-empty/lib.rs similarity index 100% rename from tests/run-make-fulldeps/lto-empty/lib.rs rename to tests/run-make/lto-empty/lib.rs diff --git a/tests/run-make-fulldeps/lto-no-link-whole-rlib/Makefile b/tests/run-make/lto-no-link-whole-rlib/Makefile similarity index 87% rename from tests/run-make-fulldeps/lto-no-link-whole-rlib/Makefile rename to tests/run-make/lto-no-link-whole-rlib/Makefile index e576ee37cf715..3e82322e72d34 100644 --- a/tests/run-make-fulldeps/lto-no-link-whole-rlib/Makefile +++ b/tests/run-make/lto-no-link-whole-rlib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,foo) $(call NATIVE_STATICLIB,bar) diff --git a/tests/run-make-fulldeps/lto-no-link-whole-rlib/bar.c b/tests/run-make/lto-no-link-whole-rlib/bar.c similarity index 100% rename from tests/run-make-fulldeps/lto-no-link-whole-rlib/bar.c rename to tests/run-make/lto-no-link-whole-rlib/bar.c diff --git a/tests/run-make-fulldeps/lto-no-link-whole-rlib/foo.c b/tests/run-make/lto-no-link-whole-rlib/foo.c similarity index 100% rename from tests/run-make-fulldeps/lto-no-link-whole-rlib/foo.c rename to tests/run-make/lto-no-link-whole-rlib/foo.c diff --git a/tests/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs b/tests/run-make/lto-no-link-whole-rlib/lib1.rs similarity index 100% rename from tests/run-make-fulldeps/lto-no-link-whole-rlib/lib1.rs rename to tests/run-make/lto-no-link-whole-rlib/lib1.rs diff --git a/tests/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs b/tests/run-make/lto-no-link-whole-rlib/lib2.rs similarity index 100% rename from tests/run-make-fulldeps/lto-no-link-whole-rlib/lib2.rs rename to tests/run-make/lto-no-link-whole-rlib/lib2.rs diff --git a/tests/run-make-fulldeps/lto-no-link-whole-rlib/main.rs b/tests/run-make/lto-no-link-whole-rlib/main.rs similarity index 100% rename from tests/run-make-fulldeps/lto-no-link-whole-rlib/main.rs rename to tests/run-make/lto-no-link-whole-rlib/main.rs diff --git a/tests/run-make-fulldeps/lto-readonly-lib/Makefile b/tests/run-make/lto-readonly-lib/Makefile similarity index 92% rename from tests/run-make-fulldeps/lto-readonly-lib/Makefile rename to tests/run-make/lto-readonly-lib/Makefile index a20ecea88ea1c..11d944e3e3d4b 100644 --- a/tests/run-make-fulldeps/lto-readonly-lib/Makefile +++ b/tests/run-make/lto-readonly-lib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/lto-readonly-lib/lib.rs b/tests/run-make/lto-readonly-lib/lib.rs similarity index 100% rename from tests/run-make-fulldeps/lto-readonly-lib/lib.rs rename to tests/run-make/lto-readonly-lib/lib.rs diff --git a/tests/run-make-fulldeps/lto-readonly-lib/main.rs b/tests/run-make/lto-readonly-lib/main.rs similarity index 100% rename from tests/run-make-fulldeps/lto-readonly-lib/main.rs rename to tests/run-make/lto-readonly-lib/main.rs diff --git a/tests/run-make-fulldeps/lto-smoke-c/Makefile b/tests/run-make/lto-smoke-c/Makefile similarity index 91% rename from tests/run-make-fulldeps/lto-smoke-c/Makefile rename to tests/run-make/lto-smoke-c/Makefile index 7c6ee3be84950..f1ba3d95da292 100644 --- a/tests/run-make-fulldeps/lto-smoke-c/Makefile +++ b/tests/run-make/lto-smoke-c/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Apparently older versions of GCC segfault if -g is passed... diff --git a/tests/run-make-fulldeps/lto-smoke-c/bar.c b/tests/run-make/lto-smoke-c/bar.c similarity index 100% rename from tests/run-make-fulldeps/lto-smoke-c/bar.c rename to tests/run-make/lto-smoke-c/bar.c diff --git a/tests/run-make-fulldeps/lto-smoke-c/foo.rs b/tests/run-make/lto-smoke-c/foo.rs similarity index 100% rename from tests/run-make-fulldeps/lto-smoke-c/foo.rs rename to tests/run-make/lto-smoke-c/foo.rs diff --git a/tests/run-make-fulldeps/lto-smoke/Makefile b/tests/run-make/lto-smoke/Makefile similarity index 94% rename from tests/run-make-fulldeps/lto-smoke/Makefile rename to tests/run-make/lto-smoke/Makefile index 8bce708b44b0b..13a09fce73404 100644 --- a/tests/run-make-fulldeps/lto-smoke/Makefile +++ b/tests/run-make/lto-smoke/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: noparam bool_true bool_false thin fat diff --git a/tests/run-make-fulldeps/lto-smoke/lib.rs b/tests/run-make/lto-smoke/lib.rs similarity index 100% rename from tests/run-make-fulldeps/lto-smoke/lib.rs rename to tests/run-make/lto-smoke/lib.rs diff --git a/tests/run-make-fulldeps/lto-smoke/main.rs b/tests/run-make/lto-smoke/main.rs similarity index 100% rename from tests/run-make-fulldeps/lto-smoke/main.rs rename to tests/run-make/lto-smoke/main.rs diff --git a/tests/run-make/macos-deployment-target/Makefile b/tests/run-make/macos-deployment-target/Makefile index 70fca04365378..d0cf836bcdfcc 100644 --- a/tests/run-make/macos-deployment-target/Makefile +++ b/tests/run-make/macos-deployment-target/Makefile @@ -4,7 +4,7 @@ # This is important since its a compatibility hazard. The linker will # generate load commands differently based on what minimum OS it can assume. -include ../../run-make-fulldeps/tools.mk +include ../tools.mk ifeq ($(strip $(shell uname -m)),arm64) GREP_PATTERN = "minos 11.0" diff --git a/tests/run-make/macos-fat-archive/Makefile b/tests/run-make/macos-fat-archive/Makefile index cc99375db6902..b6582c809e8b4 100644 --- a/tests/run-make/macos-fat-archive/Makefile +++ b/tests/run-make/macos-fat-archive/Makefile @@ -1,6 +1,6 @@ # only-macos --include ../../run-make-fulldeps/tools.mk +include ../tools.mk "$(TMPDIR)"/libnative-library.a: native-library.c $(CC) -arch arm64 -arch x86_64 native-library.c -c -o "$(TMPDIR)"/native-library.o diff --git a/tests/run-make-fulldeps/manual-crate-name/Makefile b/tests/run-make/manual-crate-name/Makefile similarity index 100% rename from tests/run-make-fulldeps/manual-crate-name/Makefile rename to tests/run-make/manual-crate-name/Makefile diff --git a/tests/run-make-fulldeps/manual-crate-name/bar.rs b/tests/run-make/manual-crate-name/bar.rs similarity index 100% rename from tests/run-make-fulldeps/manual-crate-name/bar.rs rename to tests/run-make/manual-crate-name/bar.rs diff --git a/tests/run-make-fulldeps/manual-link/Makefile b/tests/run-make/manual-link/Makefile similarity index 82% rename from tests/run-make-fulldeps/manual-link/Makefile rename to tests/run-make/manual-link/Makefile index 401f6eb440a58..8dbf0460fff50 100644 --- a/tests/run-make-fulldeps/manual-link/Makefile +++ b/tests/run-make/manual-link/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(TMPDIR)/libbar.a diff --git a/tests/run-make-fulldeps/manual-link/bar.c b/tests/run-make/manual-link/bar.c similarity index 100% rename from tests/run-make-fulldeps/manual-link/bar.c rename to tests/run-make/manual-link/bar.c diff --git a/tests/run-make-fulldeps/manual-link/foo.c b/tests/run-make/manual-link/foo.c similarity index 100% rename from tests/run-make-fulldeps/manual-link/foo.c rename to tests/run-make/manual-link/foo.c diff --git a/tests/run-make-fulldeps/manual-link/foo.rs b/tests/run-make/manual-link/foo.rs similarity index 100% rename from tests/run-make-fulldeps/manual-link/foo.rs rename to tests/run-make/manual-link/foo.rs diff --git a/tests/run-make-fulldeps/manual-link/main.rs b/tests/run-make/manual-link/main.rs similarity index 100% rename from tests/run-make-fulldeps/manual-link/main.rs rename to tests/run-make/manual-link/main.rs diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/Makefile b/tests/run-make/many-crates-but-no-match/Makefile similarity index 100% rename from tests/run-make-fulldeps/many-crates-but-no-match/Makefile rename to tests/run-make/many-crates-but-no-match/Makefile diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateA1.rs b/tests/run-make/many-crates-but-no-match/crateA1.rs similarity index 100% rename from tests/run-make-fulldeps/many-crates-but-no-match/crateA1.rs rename to tests/run-make/many-crates-but-no-match/crateA1.rs diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateA2.rs b/tests/run-make/many-crates-but-no-match/crateA2.rs similarity index 100% rename from tests/run-make-fulldeps/many-crates-but-no-match/crateA2.rs rename to tests/run-make/many-crates-but-no-match/crateA2.rs diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateA3.rs b/tests/run-make/many-crates-but-no-match/crateA3.rs similarity index 100% rename from tests/run-make-fulldeps/many-crates-but-no-match/crateA3.rs rename to tests/run-make/many-crates-but-no-match/crateA3.rs diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateB.rs b/tests/run-make/many-crates-but-no-match/crateB.rs similarity index 100% rename from tests/run-make-fulldeps/many-crates-but-no-match/crateB.rs rename to tests/run-make/many-crates-but-no-match/crateB.rs diff --git a/tests/run-make-fulldeps/many-crates-but-no-match/crateC.rs b/tests/run-make/many-crates-but-no-match/crateC.rs similarity index 100% rename from tests/run-make-fulldeps/many-crates-but-no-match/crateC.rs rename to tests/run-make/many-crates-but-no-match/crateC.rs diff --git a/tests/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile b/tests/run-make/metadata-flag-frobs-symbols/Makefile similarity index 92% rename from tests/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile rename to tests/run-make/metadata-flag-frobs-symbols/Makefile index dc6b10f4e9db2..53d7d0657695f 100644 --- a/tests/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile +++ b/tests/run-make/metadata-flag-frobs-symbols/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs b/tests/run-make/metadata-flag-frobs-symbols/bar.rs similarity index 100% rename from tests/run-make-fulldeps/metadata-flag-frobs-symbols/bar.rs rename to tests/run-make/metadata-flag-frobs-symbols/bar.rs diff --git a/tests/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs b/tests/run-make/metadata-flag-frobs-symbols/foo.rs similarity index 100% rename from tests/run-make-fulldeps/metadata-flag-frobs-symbols/foo.rs rename to tests/run-make/metadata-flag-frobs-symbols/foo.rs diff --git a/tests/run-make-fulldeps/min-global-align/Makefile b/tests/run-make/min-global-align/Makefile similarity index 100% rename from tests/run-make-fulldeps/min-global-align/Makefile rename to tests/run-make/min-global-align/Makefile diff --git a/tests/run-make-fulldeps/min-global-align/min_global_align.rs b/tests/run-make/min-global-align/min_global_align.rs similarity index 100% rename from tests/run-make-fulldeps/min-global-align/min_global_align.rs rename to tests/run-make/min-global-align/min_global_align.rs diff --git a/tests/run-make-fulldeps/mingw-export-call-convention/Makefile b/tests/run-make/mingw-export-call-convention/Makefile similarity index 100% rename from tests/run-make-fulldeps/mingw-export-call-convention/Makefile rename to tests/run-make/mingw-export-call-convention/Makefile diff --git a/tests/run-make-fulldeps/mingw-export-call-convention/foo.rs b/tests/run-make/mingw-export-call-convention/foo.rs similarity index 100% rename from tests/run-make-fulldeps/mingw-export-call-convention/foo.rs rename to tests/run-make/mingw-export-call-convention/foo.rs diff --git a/tests/run-make-fulldeps/mismatching-target-triples/Makefile b/tests/run-make/mismatching-target-triples/Makefile similarity index 100% rename from tests/run-make-fulldeps/mismatching-target-triples/Makefile rename to tests/run-make/mismatching-target-triples/Makefile diff --git a/tests/run-make-fulldeps/mismatching-target-triples/bar.rs b/tests/run-make/mismatching-target-triples/bar.rs similarity index 100% rename from tests/run-make-fulldeps/mismatching-target-triples/bar.rs rename to tests/run-make/mismatching-target-triples/bar.rs diff --git a/tests/run-make-fulldeps/mismatching-target-triples/foo.rs b/tests/run-make/mismatching-target-triples/foo.rs similarity index 100% rename from tests/run-make-fulldeps/mismatching-target-triples/foo.rs rename to tests/run-make/mismatching-target-triples/foo.rs diff --git a/tests/run-make-fulldeps/missing-crate-dependency/Makefile b/tests/run-make/missing-crate-dependency/Makefile similarity index 100% rename from tests/run-make-fulldeps/missing-crate-dependency/Makefile rename to tests/run-make/missing-crate-dependency/Makefile diff --git a/tests/run-make-fulldeps/missing-crate-dependency/crateA.rs b/tests/run-make/missing-crate-dependency/crateA.rs similarity index 100% rename from tests/run-make-fulldeps/missing-crate-dependency/crateA.rs rename to tests/run-make/missing-crate-dependency/crateA.rs diff --git a/tests/run-make-fulldeps/missing-crate-dependency/crateB.rs b/tests/run-make/missing-crate-dependency/crateB.rs similarity index 100% rename from tests/run-make-fulldeps/missing-crate-dependency/crateB.rs rename to tests/run-make/missing-crate-dependency/crateB.rs diff --git a/tests/run-make-fulldeps/missing-crate-dependency/crateC.rs b/tests/run-make/missing-crate-dependency/crateC.rs similarity index 100% rename from tests/run-make-fulldeps/missing-crate-dependency/crateC.rs rename to tests/run-make/missing-crate-dependency/crateC.rs diff --git a/tests/run-make-fulldeps/mixing-deps/Makefile b/tests/run-make/mixing-deps/Makefile similarity index 85% rename from tests/run-make-fulldeps/mixing-deps/Makefile rename to tests/run-make/mixing-deps/Makefile index 956e704ee168e..c2a5a2a0abbed 100644 --- a/tests/run-make-fulldeps/mixing-deps/Makefile +++ b/tests/run-make/mixing-deps/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/mixing-deps/both.rs b/tests/run-make/mixing-deps/both.rs similarity index 100% rename from tests/run-make-fulldeps/mixing-deps/both.rs rename to tests/run-make/mixing-deps/both.rs diff --git a/tests/run-make-fulldeps/mixing-deps/dylib.rs b/tests/run-make/mixing-deps/dylib.rs similarity index 100% rename from tests/run-make-fulldeps/mixing-deps/dylib.rs rename to tests/run-make/mixing-deps/dylib.rs diff --git a/tests/run-make-fulldeps/mixing-deps/prog.rs b/tests/run-make/mixing-deps/prog.rs similarity index 100% rename from tests/run-make-fulldeps/mixing-deps/prog.rs rename to tests/run-make/mixing-deps/prog.rs diff --git a/tests/run-make-fulldeps/mixing-formats/Makefile b/tests/run-make/mixing-formats/Makefile similarity index 99% rename from tests/run-make-fulldeps/mixing-formats/Makefile rename to tests/run-make/mixing-formats/Makefile index b27e54257f9c1..d01978a159953 100644 --- a/tests/run-make-fulldeps/mixing-formats/Makefile +++ b/tests/run-make/mixing-formats/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # Testing various mixings of rlibs and dylibs. Makes sure that it's possible to diff --git a/tests/run-make-fulldeps/mixing-formats/bar1.rs b/tests/run-make/mixing-formats/bar1.rs similarity index 100% rename from tests/run-make-fulldeps/mixing-formats/bar1.rs rename to tests/run-make/mixing-formats/bar1.rs diff --git a/tests/run-make-fulldeps/mixing-formats/bar2.rs b/tests/run-make/mixing-formats/bar2.rs similarity index 100% rename from tests/run-make-fulldeps/mixing-formats/bar2.rs rename to tests/run-make/mixing-formats/bar2.rs diff --git a/tests/run-make-fulldeps/mixing-formats/baz.rs b/tests/run-make/mixing-formats/baz.rs similarity index 100% rename from tests/run-make-fulldeps/mixing-formats/baz.rs rename to tests/run-make/mixing-formats/baz.rs diff --git a/tests/run-make-fulldeps/mixing-formats/baz2.rs b/tests/run-make/mixing-formats/baz2.rs similarity index 100% rename from tests/run-make-fulldeps/mixing-formats/baz2.rs rename to tests/run-make/mixing-formats/baz2.rs diff --git a/tests/run-make-fulldeps/mixing-formats/foo.rs b/tests/run-make/mixing-formats/foo.rs similarity index 100% rename from tests/run-make-fulldeps/mixing-formats/foo.rs rename to tests/run-make/mixing-formats/foo.rs diff --git a/tests/run-make-fulldeps/mixing-libs/Makefile b/tests/run-make/mixing-libs/Makefile similarity index 88% rename from tests/run-make-fulldeps/mixing-libs/Makefile rename to tests/run-make/mixing-libs/Makefile index 39cc0708ca1ea..e8262b284011b 100644 --- a/tests/run-make-fulldeps/mixing-libs/Makefile +++ b/tests/run-make/mixing-libs/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/mixing-libs/dylib.rs b/tests/run-make/mixing-libs/dylib.rs similarity index 100% rename from tests/run-make-fulldeps/mixing-libs/dylib.rs rename to tests/run-make/mixing-libs/dylib.rs diff --git a/tests/run-make-fulldeps/mixing-libs/prog.rs b/tests/run-make/mixing-libs/prog.rs similarity index 100% rename from tests/run-make-fulldeps/mixing-libs/prog.rs rename to tests/run-make/mixing-libs/prog.rs diff --git a/tests/run-make-fulldeps/mixing-libs/rlib.rs b/tests/run-make/mixing-libs/rlib.rs similarity index 100% rename from tests/run-make-fulldeps/mixing-libs/rlib.rs rename to tests/run-make/mixing-libs/rlib.rs diff --git a/tests/run-make-fulldeps/msvc-opt-minsize/Makefile b/tests/run-make/msvc-opt-minsize/Makefile similarity index 77% rename from tests/run-make-fulldeps/msvc-opt-minsize/Makefile rename to tests/run-make/msvc-opt-minsize/Makefile index a5f019f244e2a..32e6e28018f7a 100644 --- a/tests/run-make-fulldeps/msvc-opt-minsize/Makefile +++ b/tests/run-make/msvc-opt-minsize/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/msvc-opt-minsize/foo.rs b/tests/run-make/msvc-opt-minsize/foo.rs similarity index 100% rename from tests/run-make-fulldeps/msvc-opt-minsize/foo.rs rename to tests/run-make/msvc-opt-minsize/foo.rs diff --git a/tests/run-make-fulldeps/multiple-emits/Makefile b/tests/run-make/multiple-emits/Makefile similarity index 100% rename from tests/run-make-fulldeps/multiple-emits/Makefile rename to tests/run-make/multiple-emits/Makefile diff --git a/tests/run-make-fulldeps/multiple-emits/foo.rs b/tests/run-make/multiple-emits/foo.rs similarity index 100% rename from tests/run-make-fulldeps/multiple-emits/foo.rs rename to tests/run-make/multiple-emits/foo.rs diff --git a/tests/run-make/native-link-modifier-bundle/Makefile b/tests/run-make/native-link-modifier-bundle/Makefile index e8a1121bfcd97..527720922fe58 100644 --- a/tests/run-make/native-link-modifier-bundle/Makefile +++ b/tests/run-make/native-link-modifier-bundle/Makefile @@ -1,7 +1,7 @@ # ignore-cross-compile # ignore-windows-msvc -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # We're using the llvm-nm instead of the system nm to ensure it is compatible # with the LLVM bitcode generated by rustc. diff --git a/tests/run-make/native-link-modifier-verbatim-linker/Makefile b/tests/run-make/native-link-modifier-verbatim-linker/Makefile index 666e4084ce295..256dc2d0664ee 100644 --- a/tests/run-make/native-link-modifier-verbatim-linker/Makefile +++ b/tests/run-make/native-link-modifier-verbatim-linker/Makefile @@ -1,7 +1,7 @@ # ignore-cross-compile # ignore-macos -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: # Verbatim allows specify precise name. diff --git a/tests/run-make/native-link-modifier-verbatim-rustc/Makefile b/tests/run-make/native-link-modifier-verbatim-rustc/Makefile index 6f01f37804a2a..dfd6ec50fc008 100644 --- a/tests/run-make/native-link-modifier-verbatim-rustc/Makefile +++ b/tests/run-make/native-link-modifier-verbatim-rustc/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: # Verbatim allows specify precise name. diff --git a/tests/run-make/native-link-modifier-whole-archive/Makefile b/tests/run-make/native-link-modifier-whole-archive/Makefile index f26bd864ced31..5eb7a416f918a 100644 --- a/tests/run-make/native-link-modifier-whole-archive/Makefile +++ b/tests/run-make/native-link-modifier-whole-archive/Makefile @@ -8,7 +8,7 @@ # that code would never make it into the final executable and we'd thus be missing some # of the output. -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(TMPDIR)/$(call BIN,directly_linked) \ $(TMPDIR)/$(call BIN,directly_linked_test_plus_whole_archive) \ diff --git a/tests/run-make-fulldeps/no-builtins-lto/Makefile b/tests/run-make/no-builtins-lto/Makefile similarity index 100% rename from tests/run-make-fulldeps/no-builtins-lto/Makefile rename to tests/run-make/no-builtins-lto/Makefile diff --git a/tests/run-make-fulldeps/no-builtins-lto/main.rs b/tests/run-make/no-builtins-lto/main.rs similarity index 100% rename from tests/run-make-fulldeps/no-builtins-lto/main.rs rename to tests/run-make/no-builtins-lto/main.rs diff --git a/tests/run-make-fulldeps/no-builtins-lto/no_builtins.rs b/tests/run-make/no-builtins-lto/no_builtins.rs similarity index 100% rename from tests/run-make-fulldeps/no-builtins-lto/no_builtins.rs rename to tests/run-make/no-builtins-lto/no_builtins.rs diff --git a/tests/run-make-fulldeps/no-duplicate-libs/Makefile b/tests/run-make/no-duplicate-libs/Makefile similarity index 86% rename from tests/run-make-fulldeps/no-duplicate-libs/Makefile rename to tests/run-make/no-duplicate-libs/Makefile index b05aff7826e09..4be8c0262941a 100644 --- a/tests/run-make-fulldeps/no-duplicate-libs/Makefile +++ b/tests/run-make/no-duplicate-libs/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk ifdef IS_MSVC diff --git a/tests/run-make-fulldeps/no-duplicate-libs/bar.c b/tests/run-make/no-duplicate-libs/bar.c similarity index 100% rename from tests/run-make-fulldeps/no-duplicate-libs/bar.c rename to tests/run-make/no-duplicate-libs/bar.c diff --git a/tests/run-make-fulldeps/no-duplicate-libs/foo.c b/tests/run-make/no-duplicate-libs/foo.c similarity index 100% rename from tests/run-make-fulldeps/no-duplicate-libs/foo.c rename to tests/run-make/no-duplicate-libs/foo.c diff --git a/tests/run-make-fulldeps/no-duplicate-libs/main.rs b/tests/run-make/no-duplicate-libs/main.rs similarity index 100% rename from tests/run-make-fulldeps/no-duplicate-libs/main.rs rename to tests/run-make/no-duplicate-libs/main.rs diff --git a/tests/run-make/no-input-file/Makefile b/tests/run-make/no-input-file/Makefile index 2f02159229d3c..a754573a52410 100644 --- a/tests/run-make/no-input-file/Makefile +++ b/tests/run-make/no-input-file/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) --print crate-name 2>&1 | diff - no-input-file.stderr diff --git a/tests/run-make-fulldeps/no-intermediate-extras/Makefile b/tests/run-make/no-intermediate-extras/Makefile similarity index 86% rename from tests/run-make-fulldeps/no-intermediate-extras/Makefile rename to tests/run-make/no-intermediate-extras/Makefile index 4116aac1b8f0b..83b5cedcf2a65 100644 --- a/tests/run-make-fulldeps/no-intermediate-extras/Makefile +++ b/tests/run-make/no-intermediate-extras/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile # Regression test for issue #10973 include ../tools.mk diff --git a/tests/run-make-fulldeps/no-intermediate-extras/foo.rs b/tests/run-make/no-intermediate-extras/foo.rs similarity index 100% rename from tests/run-make-fulldeps/no-intermediate-extras/foo.rs rename to tests/run-make/no-intermediate-extras/foo.rs diff --git a/tests/run-make-fulldeps/obey-crate-type-flag/Makefile b/tests/run-make/obey-crate-type-flag/Makefile similarity index 94% rename from tests/run-make-fulldeps/obey-crate-type-flag/Makefile rename to tests/run-make/obey-crate-type-flag/Makefile index effcfc94cc5ee..ecbb2e620ed38 100644 --- a/tests/run-make-fulldeps/obey-crate-type-flag/Makefile +++ b/tests/run-make/obey-crate-type-flag/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # check that rustc builds all crate_type attributes diff --git a/tests/run-make-fulldeps/obey-crate-type-flag/test.rs b/tests/run-make/obey-crate-type-flag/test.rs similarity index 100% rename from tests/run-make-fulldeps/obey-crate-type-flag/test.rs rename to tests/run-make/obey-crate-type-flag/test.rs diff --git a/tests/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile b/tests/run-make/output-filename-conflicts-with-directory/Makefile similarity index 100% rename from tests/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile rename to tests/run-make/output-filename-conflicts-with-directory/Makefile diff --git a/tests/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs b/tests/run-make/output-filename-conflicts-with-directory/foo.rs similarity index 100% rename from tests/run-make-fulldeps/output-filename-conflicts-with-directory/foo.rs rename to tests/run-make/output-filename-conflicts-with-directory/foo.rs diff --git a/tests/run-make-fulldeps/output-filename-overwrites-input/Makefile b/tests/run-make/output-filename-overwrites-input/Makefile similarity index 96% rename from tests/run-make-fulldeps/output-filename-overwrites-input/Makefile rename to tests/run-make/output-filename-overwrites-input/Makefile index 33069c06f5ade..605b86b253ea3 100644 --- a/tests/run-make-fulldeps/output-filename-overwrites-input/Makefile +++ b/tests/run-make/output-filename-overwrites-input/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/output-filename-overwrites-input/bar.rs b/tests/run-make/output-filename-overwrites-input/bar.rs similarity index 100% rename from tests/run-make-fulldeps/output-filename-overwrites-input/bar.rs rename to tests/run-make/output-filename-overwrites-input/bar.rs diff --git a/tests/run-make-fulldeps/output-filename-overwrites-input/foo.rs b/tests/run-make/output-filename-overwrites-input/foo.rs similarity index 100% rename from tests/run-make-fulldeps/output-filename-overwrites-input/foo.rs rename to tests/run-make/output-filename-overwrites-input/foo.rs diff --git a/tests/run-make-fulldeps/output-type-permutations/Makefile b/tests/run-make/output-type-permutations/Makefile similarity index 99% rename from tests/run-make-fulldeps/output-type-permutations/Makefile rename to tests/run-make/output-type-permutations/Makefile index 791606c643b14..035033b9fddd3 100644 --- a/tests/run-make-fulldeps/output-type-permutations/Makefile +++ b/tests/run-make/output-type-permutations/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/output-type-permutations/foo.rs b/tests/run-make/output-type-permutations/foo.rs similarity index 100% rename from tests/run-make-fulldeps/output-type-permutations/foo.rs rename to tests/run-make/output-type-permutations/foo.rs diff --git a/tests/run-make-fulldeps/output-with-hyphens/Makefile b/tests/run-make/output-with-hyphens/Makefile similarity index 88% rename from tests/run-make-fulldeps/output-with-hyphens/Makefile rename to tests/run-make/output-with-hyphens/Makefile index 365fb6e591a91..846c9a66a89a0 100644 --- a/tests/run-make-fulldeps/output-with-hyphens/Makefile +++ b/tests/run-make/output-with-hyphens/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/output-with-hyphens/foo-bar.rs b/tests/run-make/output-with-hyphens/foo-bar.rs similarity index 100% rename from tests/run-make-fulldeps/output-with-hyphens/foo-bar.rs rename to tests/run-make/output-with-hyphens/foo-bar.rs diff --git a/tests/run-make-fulldeps/override-aliased-flags/Makefile b/tests/run-make/override-aliased-flags/Makefile similarity index 97% rename from tests/run-make-fulldeps/override-aliased-flags/Makefile rename to tests/run-make/override-aliased-flags/Makefile index 186b8c7c85ead..db1ff1ff98161 100644 --- a/tests/run-make-fulldeps/override-aliased-flags/Makefile +++ b/tests/run-make/override-aliased-flags/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # FIXME: it would be good to check that it's actually the rightmost flags diff --git a/tests/run-make-fulldeps/override-aliased-flags/main.rs b/tests/run-make/override-aliased-flags/main.rs similarity index 100% rename from tests/run-make-fulldeps/override-aliased-flags/main.rs rename to tests/run-make/override-aliased-flags/main.rs diff --git a/tests/run-make/overwrite-input/Makefile b/tests/run-make/overwrite-input/Makefile index 03b03eb147def..c62b5aab190db 100644 --- a/tests/run-make/overwrite-input/Makefile +++ b/tests/run-make/overwrite-input/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) main.rs -o main.rs 2> $(TMPDIR)/file.stderr || echo "failed successfully" diff --git a/tests/run-make-fulldeps/panic-impl-transitive/Makefile b/tests/run-make/panic-impl-transitive/Makefile similarity index 84% rename from tests/run-make-fulldeps/panic-impl-transitive/Makefile rename to tests/run-make/panic-impl-transitive/Makefile index c3192efcb5a08..9a271a22e10dd 100644 --- a/tests/run-make-fulldeps/panic-impl-transitive/Makefile +++ b/tests/run-make/panic-impl-transitive/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # NOTE we use --emit=llvm-ir to avoid running the linker (linking will fail because there's no main # in this crate) diff --git a/tests/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs b/tests/run-make/panic-impl-transitive/panic-impl-consumer.rs similarity index 100% rename from tests/run-make-fulldeps/panic-impl-transitive/panic-impl-consumer.rs rename to tests/run-make/panic-impl-transitive/panic-impl-consumer.rs diff --git a/tests/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs b/tests/run-make/panic-impl-transitive/panic-impl-provider.rs similarity index 100% rename from tests/run-make-fulldeps/panic-impl-transitive/panic-impl-provider.rs rename to tests/run-make/panic-impl-transitive/panic-impl-provider.rs diff --git a/tests/run-make/pass-linker-flags-from-dep/Makefile b/tests/run-make/pass-linker-flags-from-dep/Makefile index b9426326aea40..b57389bb7d491 100644 --- a/tests/run-make/pass-linker-flags-from-dep/Makefile +++ b/tests/run-make/pass-linker-flags-from-dep/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: # Build deps diff --git a/tests/run-make/pass-linker-flags/Makefile b/tests/run-make/pass-linker-flags/Makefile index a3efb8df6ac38..6ddbcbb1b08e6 100644 --- a/tests/run-make/pass-linker-flags/Makefile +++ b/tests/run-make/pass-linker-flags/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) rs.rs -Z unstable-options -l static=l1 -l link-arg=a1 -l static=l2 -l link-arg=a2 -l dylib=d1 -l link-arg=a3 --print link-args | $(CGREP) -e 'l1.*a1.*l2.*a2.*d1.*a3' diff --git a/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile b/tests/run-make/pass-non-c-like-enum-to-c/Makefile similarity index 83% rename from tests/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile rename to tests/run-make/pass-non-c-like-enum-to-c/Makefile index 42d3c977f757d..bd441d321bfab 100644 --- a/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile +++ b/tests/run-make/pass-non-c-like-enum-to-c/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,test) diff --git a/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs b/tests/run-make/pass-non-c-like-enum-to-c/nonclike.rs similarity index 100% rename from tests/run-make-fulldeps/pass-non-c-like-enum-to-c/nonclike.rs rename to tests/run-make/pass-non-c-like-enum-to-c/nonclike.rs diff --git a/tests/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c b/tests/run-make/pass-non-c-like-enum-to-c/test.c similarity index 100% rename from tests/run-make-fulldeps/pass-non-c-like-enum-to-c/test.c rename to tests/run-make/pass-non-c-like-enum-to-c/test.c diff --git a/tests/run-make-fulldeps/pgo-branch-weights/Makefile b/tests/run-make/pgo-branch-weights/Makefile similarity index 100% rename from tests/run-make-fulldeps/pgo-branch-weights/Makefile rename to tests/run-make/pgo-branch-weights/Makefile diff --git a/tests/run-make-fulldeps/pgo-branch-weights/filecheck-patterns.txt b/tests/run-make/pgo-branch-weights/filecheck-patterns.txt similarity index 100% rename from tests/run-make-fulldeps/pgo-branch-weights/filecheck-patterns.txt rename to tests/run-make/pgo-branch-weights/filecheck-patterns.txt diff --git a/tests/run-make-fulldeps/pgo-branch-weights/interesting.rs b/tests/run-make/pgo-branch-weights/interesting.rs similarity index 100% rename from tests/run-make-fulldeps/pgo-branch-weights/interesting.rs rename to tests/run-make/pgo-branch-weights/interesting.rs diff --git a/tests/run-make-fulldeps/pgo-branch-weights/main.rs b/tests/run-make/pgo-branch-weights/main.rs similarity index 100% rename from tests/run-make-fulldeps/pgo-branch-weights/main.rs rename to tests/run-make/pgo-branch-weights/main.rs diff --git a/tests/run-make-fulldeps/pgo-branch-weights/opaque.rs b/tests/run-make/pgo-branch-weights/opaque.rs similarity index 100% rename from tests/run-make-fulldeps/pgo-branch-weights/opaque.rs rename to tests/run-make/pgo-branch-weights/opaque.rs diff --git a/tests/run-make-fulldeps/pgo-gen-lto/Makefile b/tests/run-make/pgo-gen-lto/Makefile similarity index 100% rename from tests/run-make-fulldeps/pgo-gen-lto/Makefile rename to tests/run-make/pgo-gen-lto/Makefile diff --git a/tests/run-make-fulldeps/pgo-gen-lto/test.rs b/tests/run-make/pgo-gen-lto/test.rs similarity index 100% rename from tests/run-make-fulldeps/pgo-gen-lto/test.rs rename to tests/run-make/pgo-gen-lto/test.rs diff --git a/tests/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile b/tests/run-make/pgo-gen-no-imp-symbols/Makefile similarity index 100% rename from tests/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile rename to tests/run-make/pgo-gen-no-imp-symbols/Makefile diff --git a/tests/run-make-fulldeps/pgo-gen-no-imp-symbols/test.rs b/tests/run-make/pgo-gen-no-imp-symbols/test.rs similarity index 100% rename from tests/run-make-fulldeps/pgo-gen-no-imp-symbols/test.rs rename to tests/run-make/pgo-gen-no-imp-symbols/test.rs diff --git a/tests/run-make-fulldeps/pgo-gen/Makefile b/tests/run-make/pgo-gen/Makefile similarity index 100% rename from tests/run-make-fulldeps/pgo-gen/Makefile rename to tests/run-make/pgo-gen/Makefile diff --git a/tests/run-make-fulldeps/pgo-gen/test.rs b/tests/run-make/pgo-gen/test.rs similarity index 100% rename from tests/run-make-fulldeps/pgo-gen/test.rs rename to tests/run-make/pgo-gen/test.rs diff --git a/tests/run-make-fulldeps/pgo-indirect-call-promotion/Makefile b/tests/run-make/pgo-indirect-call-promotion/Makefile similarity index 100% rename from tests/run-make-fulldeps/pgo-indirect-call-promotion/Makefile rename to tests/run-make/pgo-indirect-call-promotion/Makefile diff --git a/tests/run-make-fulldeps/pgo-indirect-call-promotion/filecheck-patterns.txt b/tests/run-make/pgo-indirect-call-promotion/filecheck-patterns.txt similarity index 100% rename from tests/run-make-fulldeps/pgo-indirect-call-promotion/filecheck-patterns.txt rename to tests/run-make/pgo-indirect-call-promotion/filecheck-patterns.txt diff --git a/tests/run-make-fulldeps/pgo-indirect-call-promotion/interesting.rs b/tests/run-make/pgo-indirect-call-promotion/interesting.rs similarity index 100% rename from tests/run-make-fulldeps/pgo-indirect-call-promotion/interesting.rs rename to tests/run-make/pgo-indirect-call-promotion/interesting.rs diff --git a/tests/run-make-fulldeps/pgo-indirect-call-promotion/main.rs b/tests/run-make/pgo-indirect-call-promotion/main.rs similarity index 100% rename from tests/run-make-fulldeps/pgo-indirect-call-promotion/main.rs rename to tests/run-make/pgo-indirect-call-promotion/main.rs diff --git a/tests/run-make-fulldeps/pgo-indirect-call-promotion/opaque.rs b/tests/run-make/pgo-indirect-call-promotion/opaque.rs similarity index 100% rename from tests/run-make-fulldeps/pgo-indirect-call-promotion/opaque.rs rename to tests/run-make/pgo-indirect-call-promotion/opaque.rs diff --git a/tests/run-make-fulldeps/pgo-use/Makefile b/tests/run-make/pgo-use/Makefile similarity index 100% rename from tests/run-make-fulldeps/pgo-use/Makefile rename to tests/run-make/pgo-use/Makefile diff --git a/tests/run-make-fulldeps/pgo-use/filecheck-patterns.txt b/tests/run-make/pgo-use/filecheck-patterns.txt similarity index 100% rename from tests/run-make-fulldeps/pgo-use/filecheck-patterns.txt rename to tests/run-make/pgo-use/filecheck-patterns.txt diff --git a/tests/run-make-fulldeps/pgo-use/main.rs b/tests/run-make/pgo-use/main.rs similarity index 100% rename from tests/run-make-fulldeps/pgo-use/main.rs rename to tests/run-make/pgo-use/main.rs diff --git a/tests/run-make-fulldeps/pointer-auth-link-with-c/Makefile b/tests/run-make/pointer-auth-link-with-c/Makefile similarity index 100% rename from tests/run-make-fulldeps/pointer-auth-link-with-c/Makefile rename to tests/run-make/pointer-auth-link-with-c/Makefile diff --git a/tests/run-make-fulldeps/pointer-auth-link-with-c/test.c b/tests/run-make/pointer-auth-link-with-c/test.c similarity index 100% rename from tests/run-make-fulldeps/pointer-auth-link-with-c/test.c rename to tests/run-make/pointer-auth-link-with-c/test.c diff --git a/tests/run-make-fulldeps/pointer-auth-link-with-c/test.rs b/tests/run-make/pointer-auth-link-with-c/test.rs similarity index 100% rename from tests/run-make-fulldeps/pointer-auth-link-with-c/test.rs rename to tests/run-make/pointer-auth-link-with-c/test.rs diff --git a/tests/run-make-fulldeps/prefer-dylib/Makefile b/tests/run-make/prefer-dylib/Makefile similarity index 89% rename from tests/run-make-fulldeps/prefer-dylib/Makefile rename to tests/run-make/prefer-dylib/Makefile index 3817ca195eb2d..cc26e70ae67ca 100644 --- a/tests/run-make-fulldeps/prefer-dylib/Makefile +++ b/tests/run-make/prefer-dylib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/prefer-dylib/bar.rs b/tests/run-make/prefer-dylib/bar.rs similarity index 100% rename from tests/run-make-fulldeps/prefer-dylib/bar.rs rename to tests/run-make/prefer-dylib/bar.rs diff --git a/tests/run-make-fulldeps/prefer-dylib/foo.rs b/tests/run-make/prefer-dylib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/prefer-dylib/foo.rs rename to tests/run-make/prefer-dylib/foo.rs diff --git a/tests/run-make-fulldeps/prefer-rlib/Makefile b/tests/run-make/prefer-rlib/Makefile similarity index 88% rename from tests/run-make-fulldeps/prefer-rlib/Makefile rename to tests/run-make/prefer-rlib/Makefile index adc345d760da5..2e86b9c1dd7e0 100644 --- a/tests/run-make-fulldeps/prefer-rlib/Makefile +++ b/tests/run-make/prefer-rlib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/prefer-rlib/bar.rs b/tests/run-make/prefer-rlib/bar.rs similarity index 100% rename from tests/run-make-fulldeps/prefer-rlib/bar.rs rename to tests/run-make/prefer-rlib/bar.rs diff --git a/tests/run-make-fulldeps/prefer-rlib/foo.rs b/tests/run-make/prefer-rlib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/prefer-rlib/foo.rs rename to tests/run-make/prefer-rlib/foo.rs diff --git a/tests/run-make-fulldeps/pretty-print-to-file/Makefile b/tests/run-make/pretty-print-to-file/Makefile similarity index 100% rename from tests/run-make-fulldeps/pretty-print-to-file/Makefile rename to tests/run-make/pretty-print-to-file/Makefile diff --git a/tests/run-make-fulldeps/pretty-print-to-file/input.pp b/tests/run-make/pretty-print-to-file/input.pp similarity index 100% rename from tests/run-make-fulldeps/pretty-print-to-file/input.pp rename to tests/run-make/pretty-print-to-file/input.pp diff --git a/tests/run-make-fulldeps/pretty-print-to-file/input.rs b/tests/run-make/pretty-print-to-file/input.rs similarity index 100% rename from tests/run-make-fulldeps/pretty-print-to-file/input.rs rename to tests/run-make/pretty-print-to-file/input.rs diff --git a/tests/run-make-fulldeps/print-calling-conventions/Makefile b/tests/run-make/print-calling-conventions/Makefile similarity index 67% rename from tests/run-make-fulldeps/print-calling-conventions/Makefile rename to tests/run-make/print-calling-conventions/Makefile index d3fd06392b0ed..27b87e610862d 100644 --- a/tests/run-make-fulldeps/print-calling-conventions/Makefile +++ b/tests/run-make/print-calling-conventions/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) --print calling-conventions diff --git a/tests/run-make-fulldeps/print-cfg/Makefile b/tests/run-make/print-cfg/Makefile similarity index 100% rename from tests/run-make-fulldeps/print-cfg/Makefile rename to tests/run-make/print-cfg/Makefile diff --git a/tests/run-make-fulldeps/print-target-list/Makefile b/tests/run-make/print-target-list/Makefile similarity index 100% rename from tests/run-make-fulldeps/print-target-list/Makefile rename to tests/run-make/print-target-list/Makefile diff --git a/tests/run-make-fulldeps/profile/Makefile b/tests/run-make/profile/Makefile similarity index 100% rename from tests/run-make-fulldeps/profile/Makefile rename to tests/run-make/profile/Makefile diff --git a/tests/run-make-fulldeps/profile/test.rs b/tests/run-make/profile/test.rs similarity index 100% rename from tests/run-make-fulldeps/profile/test.rs rename to tests/run-make/profile/test.rs diff --git a/tests/run-make-fulldeps/prune-link-args/Makefile b/tests/run-make/prune-link-args/Makefile similarity index 88% rename from tests/run-make-fulldeps/prune-link-args/Makefile rename to tests/run-make/prune-link-args/Makefile index a359dc5aef102..c21ba6ace38d6 100644 --- a/tests/run-make-fulldeps/prune-link-args/Makefile +++ b/tests/run-make/prune-link-args/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-windows diff --git a/tests/run-make-fulldeps/prune-link-args/empty.rs b/tests/run-make/prune-link-args/empty.rs similarity index 100% rename from tests/run-make-fulldeps/prune-link-args/empty.rs rename to tests/run-make/prune-link-args/empty.rs diff --git a/tests/run-make/raw-dylib-alt-calling-convention/Makefile b/tests/run-make/raw-dylib-alt-calling-convention/Makefile index 03f8778d25de6..1744c431f9c99 100644 --- a/tests/run-make/raw-dylib-alt-calling-convention/Makefile +++ b/tests/run-make/raw-dylib-alt-calling-convention/Makefile @@ -3,7 +3,7 @@ # only-x86 # only-windows -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) --crate-type lib --crate-name raw_dylib_alt_calling_convention_test lib.rs diff --git a/tests/run-make/raw-dylib-c/Makefile b/tests/run-make/raw-dylib-c/Makefile index f47ab24f4fbfa..06e7935c02646 100644 --- a/tests/run-make/raw-dylib-c/Makefile +++ b/tests/run-make/raw-dylib-c/Makefile @@ -2,7 +2,7 @@ # only-windows -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs diff --git a/tests/run-make/raw-dylib-cross-compilation/Makefile b/tests/run-make/raw-dylib-cross-compilation/Makefile index 2a714f3a11fea..a8f97edd68936 100644 --- a/tests/run-make/raw-dylib-cross-compilation/Makefile +++ b/tests/run-make/raw-dylib-cross-compilation/Makefile @@ -7,7 +7,7 @@ # i686 dlltool.exe can't product x64 binaries. # ignore-i686-pc-windows-gnu -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: # Build as x86 and make sure that we have x86 objects only. diff --git a/tests/run-make/raw-dylib-import-name-type/Makefile b/tests/run-make/raw-dylib-import-name-type/Makefile index fcc60e88e1a43..67152329807cf 100644 --- a/tests/run-make/raw-dylib-import-name-type/Makefile +++ b/tests/run-make/raw-dylib-import-name-type/Makefile @@ -3,7 +3,7 @@ # only-x86 # only-windows --include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)" diff --git a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile index 722a49b02cb3b..6d1d04bfd37d2 100644 --- a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile +++ b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile @@ -2,7 +2,7 @@ # only-windows -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # We'd be using the llvm-objdump instead of the system objdump to ensure compatibility # with the LLVM bitcode generated by rustc but on Windows piping/IO redirection under MSYS2 is wonky with llvm-objdump. diff --git a/tests/run-make/raw-dylib-link-ordinal/Makefile b/tests/run-make/raw-dylib-link-ordinal/Makefile index b55a94dbc46f2..374a0b59de322 100644 --- a/tests/run-make/raw-dylib-link-ordinal/Makefile +++ b/tests/run-make/raw-dylib-link-ordinal/Makefile @@ -2,7 +2,7 @@ # only-windows -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs diff --git a/tests/run-make/raw-dylib-stdcall-ordinal/Makefile b/tests/run-make/raw-dylib-stdcall-ordinal/Makefile index b9deb7729c22b..178c15ab3dee4 100644 --- a/tests/run-make/raw-dylib-stdcall-ordinal/Makefile +++ b/tests/run-make/raw-dylib-stdcall-ordinal/Makefile @@ -3,7 +3,7 @@ # only-x86 # only-windows -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs diff --git a/tests/run-make-fulldeps/redundant-libs/Makefile b/tests/run-make/redundant-libs/Makefile similarity index 97% rename from tests/run-make-fulldeps/redundant-libs/Makefile rename to tests/run-make/redundant-libs/Makefile index b2dff05d1639a..0a48b2b280136 100644 --- a/tests/run-make-fulldeps/redundant-libs/Makefile +++ b/tests/run-make/redundant-libs/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-windows-msvc diff --git a/tests/run-make-fulldeps/redundant-libs/bar.c b/tests/run-make/redundant-libs/bar.c similarity index 100% rename from tests/run-make-fulldeps/redundant-libs/bar.c rename to tests/run-make/redundant-libs/bar.c diff --git a/tests/run-make-fulldeps/redundant-libs/baz.c b/tests/run-make/redundant-libs/baz.c similarity index 100% rename from tests/run-make-fulldeps/redundant-libs/baz.c rename to tests/run-make/redundant-libs/baz.c diff --git a/tests/run-make-fulldeps/redundant-libs/foo.c b/tests/run-make/redundant-libs/foo.c similarity index 100% rename from tests/run-make-fulldeps/redundant-libs/foo.c rename to tests/run-make/redundant-libs/foo.c diff --git a/tests/run-make-fulldeps/redundant-libs/main.rs b/tests/run-make/redundant-libs/main.rs similarity index 100% rename from tests/run-make-fulldeps/redundant-libs/main.rs rename to tests/run-make/redundant-libs/main.rs diff --git a/tests/run-make-fulldeps/relocation-model/Makefile b/tests/run-make/relocation-model/Makefile similarity index 94% rename from tests/run-make-fulldeps/relocation-model/Makefile rename to tests/run-make/relocation-model/Makefile index a31dbfd916772..8cc5205ed51b4 100644 --- a/tests/run-make-fulldeps/relocation-model/Makefile +++ b/tests/run-make/relocation-model/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: others diff --git a/tests/run-make-fulldeps/relocation-model/foo.rs b/tests/run-make/relocation-model/foo.rs similarity index 100% rename from tests/run-make-fulldeps/relocation-model/foo.rs rename to tests/run-make/relocation-model/foo.rs diff --git a/tests/run-make-fulldeps/relro-levels/Makefile b/tests/run-make/relro-levels/Makefile similarity index 97% rename from tests/run-make-fulldeps/relro-levels/Makefile rename to tests/run-make/relro-levels/Makefile index 6176fc1a58954..e0402f59f12dd 100644 --- a/tests/run-make-fulldeps/relro-levels/Makefile +++ b/tests/run-make/relro-levels/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # only-linux diff --git a/tests/run-make-fulldeps/relro-levels/hello.rs b/tests/run-make/relro-levels/hello.rs similarity index 100% rename from tests/run-make-fulldeps/relro-levels/hello.rs rename to tests/run-make/relro-levels/hello.rs diff --git a/tests/run-make/remap-path-prefix-dwarf/Makefile b/tests/run-make/remap-path-prefix-dwarf/Makefile index fbaea7b68fe56..c9ede1b60274e 100644 --- a/tests/run-make/remap-path-prefix-dwarf/Makefile +++ b/tests/run-make/remap-path-prefix-dwarf/Makefile @@ -6,7 +6,7 @@ SRC_DIR := $(abspath .) SRC_DIR_PARENT := $(abspath ..) -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: \ abs_input_outside_working_dir \ diff --git a/tests/run-make-fulldeps/remap-path-prefix/Makefile b/tests/run-make/remap-path-prefix/Makefile similarity index 100% rename from tests/run-make-fulldeps/remap-path-prefix/Makefile rename to tests/run-make/remap-path-prefix/Makefile diff --git a/tests/run-make-fulldeps/remap-path-prefix/auxiliary/lib.rs b/tests/run-make/remap-path-prefix/auxiliary/lib.rs similarity index 100% rename from tests/run-make-fulldeps/remap-path-prefix/auxiliary/lib.rs rename to tests/run-make/remap-path-prefix/auxiliary/lib.rs diff --git a/tests/run-make/repr128-dwarf/Makefile b/tests/run-make/repr128-dwarf/Makefile index 2b03c22c0d0d2..3f933042724a3 100644 --- a/tests/run-make/repr128-dwarf/Makefile +++ b/tests/run-make/repr128-dwarf/Makefile @@ -2,7 +2,7 @@ # This test should be replaced with one in tests/debuginfo once GDB or LLDB support 128-bit # enums. -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) -Cdebuginfo=2 lib.rs -o $(TMPDIR)/repr128.rlib diff --git a/tests/run-make-fulldeps/reproducible-build-2/Makefile b/tests/run-make/reproducible-build-2/Makefile similarity index 97% rename from tests/run-make-fulldeps/reproducible-build-2/Makefile rename to tests/run-make/reproducible-build-2/Makefile index 1df5e102ce36c..68fcac8b47f5f 100644 --- a/tests/run-make-fulldeps/reproducible-build-2/Makefile +++ b/tests/run-make/reproducible-build-2/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-musl diff --git a/tests/run-make-fulldeps/reproducible-build-2/linker.rs b/tests/run-make/reproducible-build-2/linker.rs similarity index 100% rename from tests/run-make-fulldeps/reproducible-build-2/linker.rs rename to tests/run-make/reproducible-build-2/linker.rs diff --git a/tests/run-make-fulldeps/reproducible-build-2/reproducible-build-aux.rs b/tests/run-make/reproducible-build-2/reproducible-build-aux.rs similarity index 100% rename from tests/run-make-fulldeps/reproducible-build-2/reproducible-build-aux.rs rename to tests/run-make/reproducible-build-2/reproducible-build-aux.rs diff --git a/tests/run-make-fulldeps/reproducible-build-2/reproducible-build.rs b/tests/run-make/reproducible-build-2/reproducible-build.rs similarity index 100% rename from tests/run-make-fulldeps/reproducible-build-2/reproducible-build.rs rename to tests/run-make/reproducible-build-2/reproducible-build.rs diff --git a/tests/run-make-fulldeps/reproducible-build/Makefile b/tests/run-make/reproducible-build/Makefile similarity index 99% rename from tests/run-make-fulldeps/reproducible-build/Makefile rename to tests/run-make/reproducible-build/Makefile index 642a480815b7b..f5d17a234c0ac 100644 --- a/tests/run-make-fulldeps/reproducible-build/Makefile +++ b/tests/run-make/reproducible-build/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-musl diff --git a/tests/run-make-fulldeps/reproducible-build/linker.rs b/tests/run-make/reproducible-build/linker.rs similarity index 100% rename from tests/run-make-fulldeps/reproducible-build/linker.rs rename to tests/run-make/reproducible-build/linker.rs diff --git a/tests/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs b/tests/run-make/reproducible-build/reproducible-build-aux.rs similarity index 100% rename from tests/run-make-fulldeps/reproducible-build/reproducible-build-aux.rs rename to tests/run-make/reproducible-build/reproducible-build-aux.rs diff --git a/tests/run-make-fulldeps/reproducible-build/reproducible-build.rs b/tests/run-make/reproducible-build/reproducible-build.rs similarity index 100% rename from tests/run-make-fulldeps/reproducible-build/reproducible-build.rs rename to tests/run-make/reproducible-build/reproducible-build.rs diff --git a/tests/run-make-fulldeps/resolve-rename/Makefile b/tests/run-make/resolve-rename/Makefile similarity index 100% rename from tests/run-make-fulldeps/resolve-rename/Makefile rename to tests/run-make/resolve-rename/Makefile diff --git a/tests/run-make-fulldeps/resolve-rename/bar.rs b/tests/run-make/resolve-rename/bar.rs similarity index 100% rename from tests/run-make-fulldeps/resolve-rename/bar.rs rename to tests/run-make/resolve-rename/bar.rs diff --git a/tests/run-make-fulldeps/resolve-rename/baz.rs b/tests/run-make/resolve-rename/baz.rs similarity index 100% rename from tests/run-make-fulldeps/resolve-rename/baz.rs rename to tests/run-make/resolve-rename/baz.rs diff --git a/tests/run-make-fulldeps/resolve-rename/foo.rs b/tests/run-make/resolve-rename/foo.rs similarity index 100% rename from tests/run-make-fulldeps/resolve-rename/foo.rs rename to tests/run-make/resolve-rename/foo.rs diff --git a/tests/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile b/tests/run-make/return-non-c-like-enum-from-c/Makefile similarity index 83% rename from tests/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile rename to tests/run-make/return-non-c-like-enum-from-c/Makefile index 42d3c977f757d..bd441d321bfab 100644 --- a/tests/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile +++ b/tests/run-make/return-non-c-like-enum-from-c/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,test) diff --git a/tests/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs b/tests/run-make/return-non-c-like-enum-from-c/nonclike.rs similarity index 100% rename from tests/run-make-fulldeps/return-non-c-like-enum-from-c/nonclike.rs rename to tests/run-make/return-non-c-like-enum-from-c/nonclike.rs diff --git a/tests/run-make-fulldeps/return-non-c-like-enum-from-c/test.c b/tests/run-make/return-non-c-like-enum-from-c/test.c similarity index 100% rename from tests/run-make-fulldeps/return-non-c-like-enum-from-c/test.c rename to tests/run-make/return-non-c-like-enum-from-c/test.c diff --git a/tests/run-make-fulldeps/return-non-c-like-enum/Makefile b/tests/run-make/return-non-c-like-enum/Makefile similarity index 89% rename from tests/run-make-fulldeps/return-non-c-like-enum/Makefile rename to tests/run-make/return-non-c-like-enum/Makefile index 513311c828946..0c8d8bf3acc60 100644 --- a/tests/run-make-fulldeps/return-non-c-like-enum/Makefile +++ b/tests/run-make/return-non-c-like-enum/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/return-non-c-like-enum/nonclike.rs b/tests/run-make/return-non-c-like-enum/nonclike.rs similarity index 100% rename from tests/run-make-fulldeps/return-non-c-like-enum/nonclike.rs rename to tests/run-make/return-non-c-like-enum/nonclike.rs diff --git a/tests/run-make-fulldeps/return-non-c-like-enum/test.c b/tests/run-make/return-non-c-like-enum/test.c similarity index 100% rename from tests/run-make-fulldeps/return-non-c-like-enum/test.c rename to tests/run-make/return-non-c-like-enum/test.c diff --git a/tests/run-make-fulldeps/rlib-chain/Makefile b/tests/run-make/rlib-chain/Makefile similarity index 85% rename from tests/run-make-fulldeps/rlib-chain/Makefile rename to tests/run-make/rlib-chain/Makefile index 236943a2a3b35..7a1f887fa5271 100644 --- a/tests/run-make-fulldeps/rlib-chain/Makefile +++ b/tests/run-make/rlib-chain/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/rlib-chain/m1.rs b/tests/run-make/rlib-chain/m1.rs similarity index 100% rename from tests/run-make-fulldeps/rlib-chain/m1.rs rename to tests/run-make/rlib-chain/m1.rs diff --git a/tests/run-make-fulldeps/rlib-chain/m2.rs b/tests/run-make/rlib-chain/m2.rs similarity index 100% rename from tests/run-make-fulldeps/rlib-chain/m2.rs rename to tests/run-make/rlib-chain/m2.rs diff --git a/tests/run-make-fulldeps/rlib-chain/m3.rs b/tests/run-make/rlib-chain/m3.rs similarity index 100% rename from tests/run-make-fulldeps/rlib-chain/m3.rs rename to tests/run-make/rlib-chain/m3.rs diff --git a/tests/run-make-fulldeps/rlib-chain/m4.rs b/tests/run-make/rlib-chain/m4.rs similarity index 100% rename from tests/run-make-fulldeps/rlib-chain/m4.rs rename to tests/run-make/rlib-chain/m4.rs diff --git a/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile b/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile index 37b8d809a2742..d2a740b06b36c 100644 --- a/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile +++ b/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../tools.mk # ignore-cross-compile diff --git a/tests/run-make/rlib-format-packed-bundled-libs-3/Makefile b/tests/run-make/rlib-format-packed-bundled-libs-3/Makefile index 62dc1b5f60602..1f2812cb08792 100644 --- a/tests/run-make/rlib-format-packed-bundled-libs-3/Makefile +++ b/tests/run-make/rlib-format-packed-bundled-libs-3/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../tools.mk # ignore-cross-compile # only-linux diff --git a/tests/run-make/rlib-format-packed-bundled-libs/Makefile b/tests/run-make/rlib-format-packed-bundled-libs/Makefile index 7fb6ce8d1e411..f454da67893d0 100644 --- a/tests/run-make/rlib-format-packed-bundled-libs/Makefile +++ b/tests/run-make/rlib-format-packed-bundled-libs/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../tools.mk # ignore-cross-compile diff --git a/tests/run-make/rustc-macro-dep-files/Makefile b/tests/run-make/rustc-macro-dep-files/Makefile index 6ae659db2e99f..76d713c4bb3c4 100644 --- a/tests/run-make/rustc-macro-dep-files/Makefile +++ b/tests/run-make/rustc-macro-dep-files/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC` # instead of hardcoding them everywhere they're needed. diff --git a/tests/run-make-fulldeps/rustdoc-determinism/Makefile b/tests/run-make/rustdoc-determinism/Makefile similarity index 100% rename from tests/run-make-fulldeps/rustdoc-determinism/Makefile rename to tests/run-make/rustdoc-determinism/Makefile diff --git a/tests/run-make-fulldeps/rustdoc-determinism/bar.rs b/tests/run-make/rustdoc-determinism/bar.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-determinism/bar.rs rename to tests/run-make/rustdoc-determinism/bar.rs diff --git a/tests/run-make-fulldeps/rustdoc-determinism/foo.rs b/tests/run-make/rustdoc-determinism/foo.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-determinism/foo.rs rename to tests/run-make/rustdoc-determinism/foo.rs diff --git a/tests/run-make-fulldeps/rustdoc-error-lines/Makefile b/tests/run-make/rustdoc-error-lines/Makefile similarity index 100% rename from tests/run-make-fulldeps/rustdoc-error-lines/Makefile rename to tests/run-make/rustdoc-error-lines/Makefile diff --git a/tests/run-make-fulldeps/rustdoc-error-lines/input.rs b/tests/run-make/rustdoc-error-lines/input.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-error-lines/input.rs rename to tests/run-make/rustdoc-error-lines/input.rs diff --git a/tests/run-make-fulldeps/rustdoc-io-error/Makefile b/tests/run-make/rustdoc-io-error/Makefile similarity index 100% rename from tests/run-make-fulldeps/rustdoc-io-error/Makefile rename to tests/run-make/rustdoc-io-error/Makefile diff --git a/tests/run-make-fulldeps/rustdoc-io-error/foo.rs b/tests/run-make/rustdoc-io-error/foo.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-io-error/foo.rs rename to tests/run-make/rustdoc-io-error/foo.rs diff --git a/tests/run-make-fulldeps/rustdoc-map-file/Makefile b/tests/run-make/rustdoc-map-file/Makefile similarity index 100% rename from tests/run-make-fulldeps/rustdoc-map-file/Makefile rename to tests/run-make/rustdoc-map-file/Makefile diff --git a/tests/run-make-fulldeps/rustdoc-map-file/expected.json b/tests/run-make/rustdoc-map-file/expected.json similarity index 100% rename from tests/run-make-fulldeps/rustdoc-map-file/expected.json rename to tests/run-make/rustdoc-map-file/expected.json diff --git a/tests/run-make-fulldeps/rustdoc-map-file/foo.rs b/tests/run-make/rustdoc-map-file/foo.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-map-file/foo.rs rename to tests/run-make/rustdoc-map-file/foo.rs diff --git a/tests/run-make-fulldeps/rustdoc-map-file/validate_json.py b/tests/run-make/rustdoc-map-file/validate_json.py similarity index 100% rename from tests/run-make-fulldeps/rustdoc-map-file/validate_json.py rename to tests/run-make/rustdoc-map-file/validate_json.py diff --git a/tests/run-make-fulldeps/rustdoc-output-path/Makefile b/tests/run-make/rustdoc-output-path/Makefile similarity index 100% rename from tests/run-make-fulldeps/rustdoc-output-path/Makefile rename to tests/run-make/rustdoc-output-path/Makefile diff --git a/tests/run-make-fulldeps/rustdoc-output-path/foo.rs b/tests/run-make/rustdoc-output-path/foo.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-output-path/foo.rs rename to tests/run-make/rustdoc-output-path/foo.rs diff --git a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile b/tests/run-make/rustdoc-scrape-examples-macros/Makefile similarity index 93% rename from tests/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile rename to tests/run-make/rustdoc-scrape-examples-macros/Makefile index c857aa4b9937a..edc19d8cb5de4 100644 --- a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile +++ b/tests/run-make/rustdoc-scrape-examples-macros/Makefile @@ -1,4 +1,5 @@ -include ../../run-make-fulldeps/tools.mk +# ignore-cross-compile +include ../../run-make/tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" DYLIB_NAME := $(shell echo | $(RUSTC) --crate-name foobar_macro --crate-type dylib --print file-names -) diff --git a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/examples/ex.rs b/tests/run-make/rustdoc-scrape-examples-macros/examples/ex.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-scrape-examples-macros/examples/ex.rs rename to tests/run-make/rustdoc-scrape-examples-macros/examples/ex.rs diff --git a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/lib.rs b/tests/run-make/rustdoc-scrape-examples-macros/src/lib.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/lib.rs rename to tests/run-make/rustdoc-scrape-examples-macros/src/lib.rs diff --git a/tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/proc.rs b/tests/run-make/rustdoc-scrape-examples-macros/src/proc.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-scrape-examples-macros/src/proc.rs rename to tests/run-make/rustdoc-scrape-examples-macros/src/proc.rs diff --git a/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk b/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk index 7a28d2145d551..57220bc6635c7 100644 --- a/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk +++ b/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" diff --git a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/Makefile b/tests/run-make/rustdoc-target-spec-json-path/Makefile similarity index 100% rename from tests/run-make-fulldeps/rustdoc-target-spec-json-path/Makefile rename to tests/run-make/rustdoc-target-spec-json-path/Makefile diff --git a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/dummy_core.rs b/tests/run-make/rustdoc-target-spec-json-path/dummy_core.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-target-spec-json-path/dummy_core.rs rename to tests/run-make/rustdoc-target-spec-json-path/dummy_core.rs diff --git a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/my_crate.rs b/tests/run-make/rustdoc-target-spec-json-path/my_crate.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-target-spec-json-path/my_crate.rs rename to tests/run-make/rustdoc-target-spec-json-path/my_crate.rs diff --git a/tests/run-make-fulldeps/rustdoc-target-spec-json-path/target.json b/tests/run-make/rustdoc-target-spec-json-path/target.json similarity index 100% rename from tests/run-make-fulldeps/rustdoc-target-spec-json-path/target.json rename to tests/run-make/rustdoc-target-spec-json-path/target.json diff --git a/tests/run-make-fulldeps/rustdoc-themes/Makefile b/tests/run-make/rustdoc-themes/Makefile similarity index 100% rename from tests/run-make-fulldeps/rustdoc-themes/Makefile rename to tests/run-make/rustdoc-themes/Makefile diff --git a/tests/run-make-fulldeps/rustdoc-themes/foo.rs b/tests/run-make/rustdoc-themes/foo.rs similarity index 100% rename from tests/run-make-fulldeps/rustdoc-themes/foo.rs rename to tests/run-make/rustdoc-themes/foo.rs diff --git a/tests/run-make/rustdoc-verify-output-files/Makefile b/tests/run-make/rustdoc-verify-output-files/Makefile index 0666122e8abc6..57ac7078d14d9 100644 --- a/tests/run-make/rustdoc-verify-output-files/Makefile +++ b/tests/run-make/rustdoc-verify-output-files/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" TMP_OUTPUT_DIR := "$(TMPDIR)/tmp-rustdoc" diff --git a/tests/run-make/rustdoc-with-out-dir-option/Makefile b/tests/run-make/rustdoc-with-out-dir-option/Makefile index b3c3f5230c187..f5d5060ed1303 100644 --- a/tests/run-make/rustdoc-with-out-dir-option/Makefile +++ b/tests/run-make/rustdoc-with-out-dir-option/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" diff --git a/tests/run-make/rustdoc-with-output-option/Makefile b/tests/run-make/rustdoc-with-output-option/Makefile index 02093a35cfc2a..d0a8205a8ee55 100644 --- a/tests/run-make/rustdoc-with-output-option/Makefile +++ b/tests/run-make/rustdoc-with-output-option/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" diff --git a/tests/run-make/rustdoc-with-short-out-dir-option/Makefile b/tests/run-make/rustdoc-with-short-out-dir-option/Makefile index dc5056a86dda2..1b9327bce2250 100644 --- a/tests/run-make/rustdoc-with-short-out-dir-option/Makefile +++ b/tests/run-make/rustdoc-with-short-out-dir-option/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" diff --git a/tests/run-make-fulldeps/sanitizer-cdylib-link/Makefile b/tests/run-make/sanitizer-cdylib-link/Makefile similarity index 100% rename from tests/run-make-fulldeps/sanitizer-cdylib-link/Makefile rename to tests/run-make/sanitizer-cdylib-link/Makefile diff --git a/tests/run-make-fulldeps/sanitizer-cdylib-link/library.rs b/tests/run-make/sanitizer-cdylib-link/library.rs similarity index 100% rename from tests/run-make-fulldeps/sanitizer-cdylib-link/library.rs rename to tests/run-make/sanitizer-cdylib-link/library.rs diff --git a/tests/run-make-fulldeps/sanitizer-cdylib-link/program.rs b/tests/run-make/sanitizer-cdylib-link/program.rs similarity index 100% rename from tests/run-make-fulldeps/sanitizer-cdylib-link/program.rs rename to tests/run-make/sanitizer-cdylib-link/program.rs diff --git a/tests/run-make-fulldeps/sanitizer-dylib-link/Makefile b/tests/run-make/sanitizer-dylib-link/Makefile similarity index 100% rename from tests/run-make-fulldeps/sanitizer-dylib-link/Makefile rename to tests/run-make/sanitizer-dylib-link/Makefile diff --git a/tests/run-make-fulldeps/sanitizer-dylib-link/library.rs b/tests/run-make/sanitizer-dylib-link/library.rs similarity index 100% rename from tests/run-make-fulldeps/sanitizer-dylib-link/library.rs rename to tests/run-make/sanitizer-dylib-link/library.rs diff --git a/tests/run-make-fulldeps/sanitizer-dylib-link/program.rs b/tests/run-make/sanitizer-dylib-link/program.rs similarity index 100% rename from tests/run-make-fulldeps/sanitizer-dylib-link/program.rs rename to tests/run-make/sanitizer-dylib-link/program.rs diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/Makefile b/tests/run-make/sanitizer-staticlib-link/Makefile similarity index 100% rename from tests/run-make-fulldeps/sanitizer-staticlib-link/Makefile rename to tests/run-make/sanitizer-staticlib-link/Makefile diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/library.rs b/tests/run-make/sanitizer-staticlib-link/library.rs similarity index 100% rename from tests/run-make-fulldeps/sanitizer-staticlib-link/library.rs rename to tests/run-make/sanitizer-staticlib-link/library.rs diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/program.c b/tests/run-make/sanitizer-staticlib-link/program.c similarity index 100% rename from tests/run-make-fulldeps/sanitizer-staticlib-link/program.c rename to tests/run-make/sanitizer-staticlib-link/program.c diff --git a/tests/run-make-fulldeps/sanitizer-staticlib-link/program.rs b/tests/run-make/sanitizer-staticlib-link/program.rs similarity index 100% rename from tests/run-make-fulldeps/sanitizer-staticlib-link/program.rs rename to tests/run-make/sanitizer-staticlib-link/program.rs diff --git a/tests/run-make-fulldeps/separate-link-fail/Makefile b/tests/run-make/separate-link-fail/Makefile similarity index 100% rename from tests/run-make-fulldeps/separate-link-fail/Makefile rename to tests/run-make/separate-link-fail/Makefile diff --git a/tests/run-make-fulldeps/separate-link/Makefile b/tests/run-make/separate-link/Makefile similarity index 85% rename from tests/run-make-fulldeps/separate-link/Makefile rename to tests/run-make/separate-link/Makefile index 3ccdb6275d158..d01158d9f5fb0 100644 --- a/tests/run-make-fulldeps/separate-link/Makefile +++ b/tests/run-make/separate-link/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/sepcomp-cci-copies/Makefile b/tests/run-make/sepcomp-cci-copies/Makefile similarity index 100% rename from tests/run-make-fulldeps/sepcomp-cci-copies/Makefile rename to tests/run-make/sepcomp-cci-copies/Makefile diff --git a/tests/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs b/tests/run-make/sepcomp-cci-copies/cci_lib.rs similarity index 100% rename from tests/run-make-fulldeps/sepcomp-cci-copies/cci_lib.rs rename to tests/run-make/sepcomp-cci-copies/cci_lib.rs diff --git a/tests/run-make-fulldeps/sepcomp-cci-copies/foo.rs b/tests/run-make/sepcomp-cci-copies/foo.rs similarity index 100% rename from tests/run-make-fulldeps/sepcomp-cci-copies/foo.rs rename to tests/run-make/sepcomp-cci-copies/foo.rs diff --git a/tests/run-make-fulldeps/sepcomp-inlining/Makefile b/tests/run-make/sepcomp-inlining/Makefile similarity index 100% rename from tests/run-make-fulldeps/sepcomp-inlining/Makefile rename to tests/run-make/sepcomp-inlining/Makefile diff --git a/tests/run-make-fulldeps/sepcomp-inlining/foo.rs b/tests/run-make/sepcomp-inlining/foo.rs similarity index 100% rename from tests/run-make-fulldeps/sepcomp-inlining/foo.rs rename to tests/run-make/sepcomp-inlining/foo.rs diff --git a/tests/run-make-fulldeps/sepcomp-separate/Makefile b/tests/run-make/sepcomp-separate/Makefile similarity index 100% rename from tests/run-make-fulldeps/sepcomp-separate/Makefile rename to tests/run-make/sepcomp-separate/Makefile diff --git a/tests/run-make-fulldeps/sepcomp-separate/foo.rs b/tests/run-make/sepcomp-separate/foo.rs similarity index 100% rename from tests/run-make-fulldeps/sepcomp-separate/foo.rs rename to tests/run-make/sepcomp-separate/foo.rs diff --git a/tests/run-make-fulldeps/share-generics-dylib/Makefile b/tests/run-make/share-generics-dylib/Makefile similarity index 96% rename from tests/run-make-fulldeps/share-generics-dylib/Makefile rename to tests/run-make/share-generics-dylib/Makefile index 065fb574c3cba..9d97eca80d3f5 100644 --- a/tests/run-make-fulldeps/share-generics-dylib/Makefile +++ b/tests/run-make/share-generics-dylib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile # This test makes sure all generic instances get re-exported from Rust dylibs for use by # `-Zshare-generics`. There are two rlibs (`instance_provider_a` and `instance_provider_b`) # which both provide an instance of `Cell::set`. There is `instance_user_dylib` which is @@ -9,7 +10,7 @@ # # This is regression test for https://github.com/rust-lang/rust/issues/67276. -include ../../run-make-fulldeps/tools.mk +include ../tools.mk COMMON_ARGS=-Cprefer-dynamic -Zshare-generics=yes -Ccodegen-units=1 -Csymbol-mangling-version=v0 diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs b/tests/run-make/share-generics-dylib/instance_provider_a.rs similarity index 100% rename from tests/run-make-fulldeps/share-generics-dylib/instance_provider_a.rs rename to tests/run-make/share-generics-dylib/instance_provider_a.rs diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs b/tests/run-make/share-generics-dylib/instance_provider_b.rs similarity index 100% rename from tests/run-make-fulldeps/share-generics-dylib/instance_provider_b.rs rename to tests/run-make/share-generics-dylib/instance_provider_b.rs diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs b/tests/run-make/share-generics-dylib/instance_user_a_rlib.rs similarity index 100% rename from tests/run-make-fulldeps/share-generics-dylib/instance_user_a_rlib.rs rename to tests/run-make/share-generics-dylib/instance_user_a_rlib.rs diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs b/tests/run-make/share-generics-dylib/instance_user_b_rlib.rs similarity index 100% rename from tests/run-make-fulldeps/share-generics-dylib/instance_user_b_rlib.rs rename to tests/run-make/share-generics-dylib/instance_user_b_rlib.rs diff --git a/tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs b/tests/run-make/share-generics-dylib/instance_user_dylib.rs similarity index 100% rename from tests/run-make-fulldeps/share-generics-dylib/instance_user_dylib.rs rename to tests/run-make/share-generics-dylib/instance_user_dylib.rs diff --git a/tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs b/tests/run-make/share-generics-dylib/linked_leaf.rs similarity index 100% rename from tests/run-make-fulldeps/share-generics-dylib/linked_leaf.rs rename to tests/run-make/share-generics-dylib/linked_leaf.rs diff --git a/tests/run-make-fulldeps/simd-ffi/Makefile b/tests/run-make/simd-ffi/Makefile similarity index 100% rename from tests/run-make-fulldeps/simd-ffi/Makefile rename to tests/run-make/simd-ffi/Makefile diff --git a/tests/run-make-fulldeps/simd-ffi/simd.rs b/tests/run-make/simd-ffi/simd.rs similarity index 100% rename from tests/run-make-fulldeps/simd-ffi/simd.rs rename to tests/run-make/simd-ffi/simd.rs diff --git a/tests/run-make-fulldeps/simple-dylib/Makefile b/tests/run-make/simple-dylib/Makefile similarity index 83% rename from tests/run-make-fulldeps/simple-dylib/Makefile rename to tests/run-make/simple-dylib/Makefile index 5dda5d66d1c84..f3e1c1da88cec 100644 --- a/tests/run-make-fulldeps/simple-dylib/Makefile +++ b/tests/run-make/simple-dylib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(RUSTC) bar.rs --crate-type=dylib -C prefer-dynamic diff --git a/tests/run-make-fulldeps/simple-dylib/bar.rs b/tests/run-make/simple-dylib/bar.rs similarity index 100% rename from tests/run-make-fulldeps/simple-dylib/bar.rs rename to tests/run-make/simple-dylib/bar.rs diff --git a/tests/run-make-fulldeps/simple-dylib/foo.rs b/tests/run-make/simple-dylib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/simple-dylib/foo.rs rename to tests/run-make/simple-dylib/foo.rs diff --git a/tests/run-make-fulldeps/simple-rlib/Makefile b/tests/run-make/simple-rlib/Makefile similarity index 80% rename from tests/run-make-fulldeps/simple-rlib/Makefile rename to tests/run-make/simple-rlib/Makefile index d912b8a7bab1f..28df61a15478d 100644 --- a/tests/run-make-fulldeps/simple-rlib/Makefile +++ b/tests/run-make/simple-rlib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(RUSTC) bar.rs --crate-type=rlib diff --git a/tests/run-make-fulldeps/simple-rlib/bar.rs b/tests/run-make/simple-rlib/bar.rs similarity index 100% rename from tests/run-make-fulldeps/simple-rlib/bar.rs rename to tests/run-make/simple-rlib/bar.rs diff --git a/tests/run-make-fulldeps/simple-rlib/foo.rs b/tests/run-make/simple-rlib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/simple-rlib/foo.rs rename to tests/run-make/simple-rlib/foo.rs diff --git a/tests/run-make-fulldeps/split-debuginfo/Makefile b/tests/run-make/split-debuginfo/Makefile similarity index 99% rename from tests/run-make-fulldeps/split-debuginfo/Makefile rename to tests/run-make/split-debuginfo/Makefile index 44cda0d3d117f..71e014c1f7147 100644 --- a/tests/run-make-fulldeps/split-debuginfo/Makefile +++ b/tests/run-make/split-debuginfo/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: off packed unpacked diff --git a/tests/run-make-fulldeps/split-debuginfo/bar.rs b/tests/run-make/split-debuginfo/bar.rs similarity index 100% rename from tests/run-make-fulldeps/split-debuginfo/bar.rs rename to tests/run-make/split-debuginfo/bar.rs diff --git a/tests/run-make-fulldeps/split-debuginfo/baz.rs b/tests/run-make/split-debuginfo/baz.rs similarity index 100% rename from tests/run-make-fulldeps/split-debuginfo/baz.rs rename to tests/run-make/split-debuginfo/baz.rs diff --git a/tests/run-make-fulldeps/split-debuginfo/foo.rs b/tests/run-make/split-debuginfo/foo.rs similarity index 100% rename from tests/run-make-fulldeps/split-debuginfo/foo.rs rename to tests/run-make/split-debuginfo/foo.rs diff --git a/tests/run-make-fulldeps/split-debuginfo/main.rs b/tests/run-make/split-debuginfo/main.rs similarity index 100% rename from tests/run-make-fulldeps/split-debuginfo/main.rs rename to tests/run-make/split-debuginfo/main.rs diff --git a/tests/run-make-fulldeps/stable-symbol-names/Makefile b/tests/run-make/stable-symbol-names/Makefile similarity index 100% rename from tests/run-make-fulldeps/stable-symbol-names/Makefile rename to tests/run-make/stable-symbol-names/Makefile diff --git a/tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs b/tests/run-make/stable-symbol-names/stable-symbol-names1.rs similarity index 100% rename from tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names1.rs rename to tests/run-make/stable-symbol-names/stable-symbol-names1.rs diff --git a/tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs b/tests/run-make/stable-symbol-names/stable-symbol-names2.rs similarity index 100% rename from tests/run-make-fulldeps/stable-symbol-names/stable-symbol-names2.rs rename to tests/run-make/stable-symbol-names/stable-symbol-names2.rs diff --git a/tests/run-make-fulldeps/static-dylib-by-default/Makefile b/tests/run-make/static-dylib-by-default/Makefile similarity index 92% rename from tests/run-make-fulldeps/static-dylib-by-default/Makefile rename to tests/run-make/static-dylib-by-default/Makefile index eedd0b320920a..cdaab42d06c5c 100644 --- a/tests/run-make-fulldeps/static-dylib-by-default/Makefile +++ b/tests/run-make/static-dylib-by-default/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk TO_LINK := $(call DYLIB,bar) diff --git a/tests/run-make-fulldeps/static-dylib-by-default/bar.rs b/tests/run-make/static-dylib-by-default/bar.rs similarity index 100% rename from tests/run-make-fulldeps/static-dylib-by-default/bar.rs rename to tests/run-make/static-dylib-by-default/bar.rs diff --git a/tests/run-make-fulldeps/static-dylib-by-default/foo.rs b/tests/run-make/static-dylib-by-default/foo.rs similarity index 100% rename from tests/run-make-fulldeps/static-dylib-by-default/foo.rs rename to tests/run-make/static-dylib-by-default/foo.rs diff --git a/tests/run-make-fulldeps/static-dylib-by-default/main.c b/tests/run-make/static-dylib-by-default/main.c similarity index 100% rename from tests/run-make-fulldeps/static-dylib-by-default/main.c rename to tests/run-make/static-dylib-by-default/main.c diff --git a/tests/run-make-fulldeps/static-extern-type/Makefile b/tests/run-make/static-extern-type/Makefile similarity index 84% rename from tests/run-make-fulldeps/static-extern-type/Makefile rename to tests/run-make/static-extern-type/Makefile index e9aa95e63a05f..778971543221e 100644 --- a/tests/run-make-fulldeps/static-extern-type/Makefile +++ b/tests/run-make/static-extern-type/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: $(call NATIVE_STATICLIB,define-foo) diff --git a/tests/run-make-fulldeps/static-extern-type/define-foo.c b/tests/run-make/static-extern-type/define-foo.c similarity index 100% rename from tests/run-make-fulldeps/static-extern-type/define-foo.c rename to tests/run-make/static-extern-type/define-foo.c diff --git a/tests/run-make-fulldeps/static-extern-type/use-foo.rs b/tests/run-make/static-extern-type/use-foo.rs similarity index 100% rename from tests/run-make-fulldeps/static-extern-type/use-foo.rs rename to tests/run-make/static-extern-type/use-foo.rs diff --git a/tests/run-make/static-pie/Makefile b/tests/run-make/static-pie/Makefile index f4e6adf1b183c..19c041d94284c 100644 --- a/tests/run-make/static-pie/Makefile +++ b/tests/run-make/static-pie/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-x86_64 # only-linux diff --git a/tests/run-make-fulldeps/static-unwinding/Makefile b/tests/run-make/static-unwinding/Makefile similarity index 77% rename from tests/run-make-fulldeps/static-unwinding/Makefile rename to tests/run-make/static-unwinding/Makefile index 9c755d4ab1819..dec94fb16f408 100644 --- a/tests/run-make-fulldeps/static-unwinding/Makefile +++ b/tests/run-make/static-unwinding/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/static-unwinding/lib.rs b/tests/run-make/static-unwinding/lib.rs similarity index 100% rename from tests/run-make-fulldeps/static-unwinding/lib.rs rename to tests/run-make/static-unwinding/lib.rs diff --git a/tests/run-make-fulldeps/static-unwinding/main.rs b/tests/run-make/static-unwinding/main.rs similarity index 100% rename from tests/run-make-fulldeps/static-unwinding/main.rs rename to tests/run-make/static-unwinding/main.rs diff --git a/tests/run-make-fulldeps/staticlib-blank-lib/Makefile b/tests/run-make/staticlib-blank-lib/Makefile similarity index 100% rename from tests/run-make-fulldeps/staticlib-blank-lib/Makefile rename to tests/run-make/staticlib-blank-lib/Makefile diff --git a/tests/run-make-fulldeps/staticlib-blank-lib/foo.rs b/tests/run-make/staticlib-blank-lib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/staticlib-blank-lib/foo.rs rename to tests/run-make/staticlib-blank-lib/foo.rs diff --git a/tests/run-make-fulldeps/std-core-cycle/Makefile b/tests/run-make/std-core-cycle/Makefile similarity index 90% rename from tests/run-make-fulldeps/std-core-cycle/Makefile rename to tests/run-make/std-core-cycle/Makefile index 4f25286376790..5ed6be905dffa 100644 --- a/tests/run-make-fulldeps/std-core-cycle/Makefile +++ b/tests/run-make/std-core-cycle/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk ifeq ($(UNAME),Darwin) diff --git a/tests/run-make-fulldeps/std-core-cycle/bar.rs b/tests/run-make/std-core-cycle/bar.rs similarity index 100% rename from tests/run-make-fulldeps/std-core-cycle/bar.rs rename to tests/run-make/std-core-cycle/bar.rs diff --git a/tests/run-make-fulldeps/std-core-cycle/foo.rs b/tests/run-make/std-core-cycle/foo.rs similarity index 100% rename from tests/run-make-fulldeps/std-core-cycle/foo.rs rename to tests/run-make/std-core-cycle/foo.rs diff --git a/tests/run-make-fulldeps/stdin-non-utf8/Makefile b/tests/run-make/stdin-non-utf8/Makefile similarity index 100% rename from tests/run-make-fulldeps/stdin-non-utf8/Makefile rename to tests/run-make/stdin-non-utf8/Makefile diff --git a/tests/run-make-fulldeps/stdin-non-utf8/non-utf8 b/tests/run-make/stdin-non-utf8/non-utf8 similarity index 100% rename from tests/run-make-fulldeps/stdin-non-utf8/non-utf8 rename to tests/run-make/stdin-non-utf8/non-utf8 diff --git a/tests/run-make-fulldeps/suspicious-library/Makefile b/tests/run-make/suspicious-library/Makefile similarity index 87% rename from tests/run-make-fulldeps/suspicious-library/Makefile rename to tests/run-make/suspicious-library/Makefile index 2af9e85c228fd..3b5ab3c53a564 100644 --- a/tests/run-make-fulldeps/suspicious-library/Makefile +++ b/tests/run-make/suspicious-library/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/suspicious-library/bar.rs b/tests/run-make/suspicious-library/bar.rs similarity index 100% rename from tests/run-make-fulldeps/suspicious-library/bar.rs rename to tests/run-make/suspicious-library/bar.rs diff --git a/tests/run-make-fulldeps/suspicious-library/foo.rs b/tests/run-make/suspicious-library/foo.rs similarity index 100% rename from tests/run-make-fulldeps/suspicious-library/foo.rs rename to tests/run-make/suspicious-library/foo.rs diff --git a/tests/run-make-fulldeps/symbol-visibility/Makefile b/tests/run-make/symbol-visibility/Makefile similarity index 99% rename from tests/run-make-fulldeps/symbol-visibility/Makefile rename to tests/run-make/symbol-visibility/Makefile index 17052ef4e6346..9159af214ca7b 100644 --- a/tests/run-make-fulldeps/symbol-visibility/Makefile +++ b/tests/run-make/symbol-visibility/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-windows-msvc diff --git a/tests/run-make-fulldeps/symbol-visibility/a_cdylib.rs b/tests/run-make/symbol-visibility/a_cdylib.rs similarity index 100% rename from tests/run-make-fulldeps/symbol-visibility/a_cdylib.rs rename to tests/run-make/symbol-visibility/a_cdylib.rs diff --git a/tests/run-make-fulldeps/symbol-visibility/a_proc_macro.rs b/tests/run-make/symbol-visibility/a_proc_macro.rs similarity index 100% rename from tests/run-make-fulldeps/symbol-visibility/a_proc_macro.rs rename to tests/run-make/symbol-visibility/a_proc_macro.rs diff --git a/tests/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs b/tests/run-make/symbol-visibility/a_rust_dylib.rs similarity index 100% rename from tests/run-make-fulldeps/symbol-visibility/a_rust_dylib.rs rename to tests/run-make/symbol-visibility/a_rust_dylib.rs diff --git a/tests/run-make-fulldeps/symbol-visibility/an_executable.rs b/tests/run-make/symbol-visibility/an_executable.rs similarity index 100% rename from tests/run-make-fulldeps/symbol-visibility/an_executable.rs rename to tests/run-make/symbol-visibility/an_executable.rs diff --git a/tests/run-make-fulldeps/symbol-visibility/an_rlib.rs b/tests/run-make/symbol-visibility/an_rlib.rs similarity index 100% rename from tests/run-make-fulldeps/symbol-visibility/an_rlib.rs rename to tests/run-make/symbol-visibility/an_rlib.rs diff --git a/tests/run-make-fulldeps/symbols-include-type-name/Makefile b/tests/run-make/symbols-include-type-name/Makefile similarity index 100% rename from tests/run-make-fulldeps/symbols-include-type-name/Makefile rename to tests/run-make/symbols-include-type-name/Makefile diff --git a/tests/run-make-fulldeps/symbols-include-type-name/lib.rs b/tests/run-make/symbols-include-type-name/lib.rs similarity index 100% rename from tests/run-make-fulldeps/symbols-include-type-name/lib.rs rename to tests/run-make/symbols-include-type-name/lib.rs diff --git a/tests/run-make-fulldeps/symlinked-extern/Makefile b/tests/run-make/symlinked-extern/Makefile similarity index 92% rename from tests/run-make-fulldeps/symlinked-extern/Makefile rename to tests/run-make/symlinked-extern/Makefile index 058f43e857a2b..28c764b84e8b7 100644 --- a/tests/run-make-fulldeps/symlinked-extern/Makefile +++ b/tests/run-make/symlinked-extern/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-windows diff --git a/tests/run-make-fulldeps/symlinked-extern/bar.rs b/tests/run-make/symlinked-extern/bar.rs similarity index 100% rename from tests/run-make-fulldeps/symlinked-extern/bar.rs rename to tests/run-make/symlinked-extern/bar.rs diff --git a/tests/run-make-fulldeps/symlinked-extern/baz.rs b/tests/run-make/symlinked-extern/baz.rs similarity index 100% rename from tests/run-make-fulldeps/symlinked-extern/baz.rs rename to tests/run-make/symlinked-extern/baz.rs diff --git a/tests/run-make-fulldeps/symlinked-extern/foo.rs b/tests/run-make/symlinked-extern/foo.rs similarity index 100% rename from tests/run-make-fulldeps/symlinked-extern/foo.rs rename to tests/run-make/symlinked-extern/foo.rs diff --git a/tests/run-make-fulldeps/symlinked-libraries/Makefile b/tests/run-make/symlinked-libraries/Makefile similarity index 90% rename from tests/run-make-fulldeps/symlinked-libraries/Makefile rename to tests/run-make/symlinked-libraries/Makefile index 576bf7e54bed8..fb0b6127e6f5c 100644 --- a/tests/run-make-fulldeps/symlinked-libraries/Makefile +++ b/tests/run-make/symlinked-libraries/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-windows diff --git a/tests/run-make-fulldeps/symlinked-libraries/bar.rs b/tests/run-make/symlinked-libraries/bar.rs similarity index 100% rename from tests/run-make-fulldeps/symlinked-libraries/bar.rs rename to tests/run-make/symlinked-libraries/bar.rs diff --git a/tests/run-make-fulldeps/symlinked-libraries/foo.rs b/tests/run-make/symlinked-libraries/foo.rs similarity index 100% rename from tests/run-make-fulldeps/symlinked-libraries/foo.rs rename to tests/run-make/symlinked-libraries/foo.rs diff --git a/tests/run-make-fulldeps/symlinked-rlib/Makefile b/tests/run-make/symlinked-rlib/Makefile similarity index 90% rename from tests/run-make-fulldeps/symlinked-rlib/Makefile rename to tests/run-make/symlinked-rlib/Makefile index 49d3f220a353f..a8565f683c3e8 100644 --- a/tests/run-make-fulldeps/symlinked-rlib/Makefile +++ b/tests/run-make/symlinked-rlib/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk # ignore-windows diff --git a/tests/run-make-fulldeps/symlinked-rlib/bar.rs b/tests/run-make/symlinked-rlib/bar.rs similarity index 100% rename from tests/run-make-fulldeps/symlinked-rlib/bar.rs rename to tests/run-make/symlinked-rlib/bar.rs diff --git a/tests/run-make-fulldeps/symlinked-rlib/foo.rs b/tests/run-make/symlinked-rlib/foo.rs similarity index 100% rename from tests/run-make-fulldeps/symlinked-rlib/foo.rs rename to tests/run-make/symlinked-rlib/foo.rs diff --git a/tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/tests/run-make/sysroot-crates-are-unstable/Makefile similarity index 100% rename from tests/run-make-fulldeps/sysroot-crates-are-unstable/Makefile rename to tests/run-make/sysroot-crates-are-unstable/Makefile diff --git a/tests/run-make-fulldeps/sysroot-crates-are-unstable/test.py b/tests/run-make/sysroot-crates-are-unstable/test.py similarity index 97% rename from tests/run-make-fulldeps/sysroot-crates-are-unstable/test.py rename to tests/run-make/sysroot-crates-are-unstable/test.py index cb77eb34fef08..cab4faa4e645a 100644 --- a/tests/run-make-fulldeps/sysroot-crates-are-unstable/test.py +++ b/tests/run-make/sysroot-crates-are-unstable/test.py @@ -43,6 +43,7 @@ def check_lib(lib): return True print('verifying if {} is an unstable crate'.format(lib['name'])) stdout, stderr = exec_command([os.environ['RUSTC'], '-', '--crate-type', 'rlib', + '--target', os.environ['TARGET'], '--extern', '{}={}'.format(lib['name'], lib['path'])], to_input=('extern crate {};'.format(lib['name'])).encode('utf-8')) if not 'use of unstable library feature' in '{}{}'.format(stdout, stderr): diff --git a/tests/run-make-fulldeps/target-cpu-native/Makefile b/tests/run-make/target-cpu-native/Makefile similarity index 100% rename from tests/run-make-fulldeps/target-cpu-native/Makefile rename to tests/run-make/target-cpu-native/Makefile diff --git a/tests/run-make-fulldeps/target-cpu-native/foo.rs b/tests/run-make/target-cpu-native/foo.rs similarity index 100% rename from tests/run-make-fulldeps/target-cpu-native/foo.rs rename to tests/run-make/target-cpu-native/foo.rs diff --git a/tests/run-make-fulldeps/target-specs/Makefile b/tests/run-make/target-specs/Makefile similarity index 100% rename from tests/run-make-fulldeps/target-specs/Makefile rename to tests/run-make/target-specs/Makefile diff --git a/tests/run-make-fulldeps/target-specs/definitely-not-builtin-target.json b/tests/run-make/target-specs/definitely-not-builtin-target.json similarity index 100% rename from tests/run-make-fulldeps/target-specs/definitely-not-builtin-target.json rename to tests/run-make/target-specs/definitely-not-builtin-target.json diff --git a/tests/run-make-fulldeps/target-specs/foo.rs b/tests/run-make/target-specs/foo.rs similarity index 100% rename from tests/run-make-fulldeps/target-specs/foo.rs rename to tests/run-make/target-specs/foo.rs diff --git a/tests/run-make-fulldeps/target-specs/mismatching-data-layout.json b/tests/run-make/target-specs/mismatching-data-layout.json similarity index 100% rename from tests/run-make-fulldeps/target-specs/mismatching-data-layout.json rename to tests/run-make/target-specs/mismatching-data-layout.json diff --git a/tests/run-make-fulldeps/target-specs/my-awesome-platform.json b/tests/run-make/target-specs/my-awesome-platform.json similarity index 100% rename from tests/run-make-fulldeps/target-specs/my-awesome-platform.json rename to tests/run-make/target-specs/my-awesome-platform.json diff --git a/tests/run-make-fulldeps/target-specs/my-incomplete-platform.json b/tests/run-make/target-specs/my-incomplete-platform.json similarity index 100% rename from tests/run-make-fulldeps/target-specs/my-incomplete-platform.json rename to tests/run-make/target-specs/my-incomplete-platform.json diff --git a/tests/run-make-fulldeps/target-specs/my-invalid-platform.json b/tests/run-make/target-specs/my-invalid-platform.json similarity index 100% rename from tests/run-make-fulldeps/target-specs/my-invalid-platform.json rename to tests/run-make/target-specs/my-invalid-platform.json diff --git a/tests/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json b/tests/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json similarity index 100% rename from tests/run-make-fulldeps/target-specs/my-x86_64-unknown-linux-gnu-platform.json rename to tests/run-make/target-specs/my-x86_64-unknown-linux-gnu-platform.json diff --git a/tests/run-make-fulldeps/target-without-atomic-cas/Makefile b/tests/run-make/target-without-atomic-cas/Makefile similarity index 100% rename from tests/run-make-fulldeps/target-without-atomic-cas/Makefile rename to tests/run-make/target-without-atomic-cas/Makefile diff --git a/tests/run-make/test-benches/Makefile b/tests/run-make/test-benches/Makefile index 8fc122515d0a3..0253a52637f69 100644 --- a/tests/run-make/test-benches/Makefile +++ b/tests/run-make/test-benches/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # ignore-cross-compile diff --git a/tests/run-make-fulldeps/test-harness/Makefile b/tests/run-make/test-harness/Makefile similarity index 93% rename from tests/run-make-fulldeps/test-harness/Makefile rename to tests/run-make/test-harness/Makefile index 1fe059b07d2a0..ee8c9294f91ab 100644 --- a/tests/run-make-fulldeps/test-harness/Makefile +++ b/tests/run-make/test-harness/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/test-harness/test-ignore-cfg.rs b/tests/run-make/test-harness/test-ignore-cfg.rs similarity index 100% rename from tests/run-make-fulldeps/test-harness/test-ignore-cfg.rs rename to tests/run-make/test-harness/test-ignore-cfg.rs diff --git a/tests/run-make/thumb-none-cortex-m/Makefile b/tests/run-make/thumb-none-cortex-m/Makefile index 3065141c08a39..e941fc4a78e1c 100644 --- a/tests/run-make/thumb-none-cortex-m/Makefile +++ b/tests/run-make/thumb-none-cortex-m/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # How to run this # $ ./x.py clean diff --git a/tests/run-make/thumb-none-qemu/Makefile b/tests/run-make/thumb-none-qemu/Makefile index a1c2ba12cd069..eea6ca3499289 100644 --- a/tests/run-make/thumb-none-qemu/Makefile +++ b/tests/run-make/thumb-none-qemu/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-thumb diff --git a/tests/run-make-fulldeps/tools.mk b/tests/run-make/tools.mk similarity index 100% rename from tests/run-make-fulldeps/tools.mk rename to tests/run-make/tools.mk diff --git a/tests/run-make/track-path-dep-info/Makefile b/tests/run-make/track-path-dep-info/Makefile index ee853943f8bce..0d6c9b1d2f01d 100644 --- a/tests/run-make/track-path-dep-info/Makefile +++ b/tests/run-make/track-path-dep-info/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC` # instead of hardcoding them everywhere they're needed. diff --git a/tests/run-make/track-pgo-dep-info/Makefile b/tests/run-make/track-pgo-dep-info/Makefile index 60b59c04aa95c..6c7f67d0f0a9d 100644 --- a/tests/run-make/track-pgo-dep-info/Makefile +++ b/tests/run-make/track-pgo-dep-info/Makefile @@ -1,7 +1,7 @@ # needs-profiler-support # ignore-windows-gnu --include ../../run-make-fulldeps/tools.mk +include ../tools.mk # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC` # instead of hardcoding them everywhere they're needed. diff --git a/tests/run-make/translation/Makefile b/tests/run-make/translation/Makefile index 397fc542909ac..0acf64e5da706 100644 --- a/tests/run-make/translation/Makefile +++ b/tests/run-make/translation/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # This test uses `ln -s` rather than copying to save testing time, but its # usage doesn't work on Windows. diff --git a/tests/run-make-fulldeps/type-mismatch-same-crate-name/Makefile b/tests/run-make/type-mismatch-same-crate-name/Makefile similarity index 100% rename from tests/run-make-fulldeps/type-mismatch-same-crate-name/Makefile rename to tests/run-make/type-mismatch-same-crate-name/Makefile diff --git a/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs b/tests/run-make/type-mismatch-same-crate-name/crateA.rs similarity index 100% rename from tests/run-make-fulldeps/type-mismatch-same-crate-name/crateA.rs rename to tests/run-make/type-mismatch-same-crate-name/crateA.rs diff --git a/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs b/tests/run-make/type-mismatch-same-crate-name/crateB.rs similarity index 100% rename from tests/run-make-fulldeps/type-mismatch-same-crate-name/crateB.rs rename to tests/run-make/type-mismatch-same-crate-name/crateB.rs diff --git a/tests/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs b/tests/run-make/type-mismatch-same-crate-name/crateC.rs similarity index 100% rename from tests/run-make-fulldeps/type-mismatch-same-crate-name/crateC.rs rename to tests/run-make/type-mismatch-same-crate-name/crateC.rs diff --git a/tests/run-make/unstable-flag-required/Makefile b/tests/run-make/unstable-flag-required/Makefile index d3a734fae77f9..17dd15b079c62 100644 --- a/tests/run-make/unstable-flag-required/Makefile +++ b/tests/run-make/unstable-flag-required/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTDOC) --output-format=json x.html 2>&1 | diff - output-format-json.stderr diff --git a/tests/run-make-fulldeps/use-extern-for-plugins/Makefile b/tests/run-make/use-extern-for-plugins/Makefile similarity index 100% rename from tests/run-make-fulldeps/use-extern-for-plugins/Makefile rename to tests/run-make/use-extern-for-plugins/Makefile diff --git a/tests/run-make-fulldeps/use-extern-for-plugins/bar.rs b/tests/run-make/use-extern-for-plugins/bar.rs similarity index 100% rename from tests/run-make-fulldeps/use-extern-for-plugins/bar.rs rename to tests/run-make/use-extern-for-plugins/bar.rs diff --git a/tests/run-make-fulldeps/use-extern-for-plugins/baz.rs b/tests/run-make/use-extern-for-plugins/baz.rs similarity index 100% rename from tests/run-make-fulldeps/use-extern-for-plugins/baz.rs rename to tests/run-make/use-extern-for-plugins/baz.rs diff --git a/tests/run-make-fulldeps/use-extern-for-plugins/foo.rs b/tests/run-make/use-extern-for-plugins/foo.rs similarity index 100% rename from tests/run-make-fulldeps/use-extern-for-plugins/foo.rs rename to tests/run-make/use-extern-for-plugins/foo.rs diff --git a/tests/run-make-fulldeps/use-suggestions-rust-2018/Makefile b/tests/run-make/use-suggestions-rust-2018/Makefile similarity index 100% rename from tests/run-make-fulldeps/use-suggestions-rust-2018/Makefile rename to tests/run-make/use-suggestions-rust-2018/Makefile diff --git a/tests/run-make-fulldeps/use-suggestions-rust-2018/ep-nested-lib.rs b/tests/run-make/use-suggestions-rust-2018/ep-nested-lib.rs similarity index 100% rename from tests/run-make-fulldeps/use-suggestions-rust-2018/ep-nested-lib.rs rename to tests/run-make/use-suggestions-rust-2018/ep-nested-lib.rs diff --git a/tests/run-make-fulldeps/use-suggestions-rust-2018/use-suggestions.rs b/tests/run-make/use-suggestions-rust-2018/use-suggestions.rs similarity index 100% rename from tests/run-make-fulldeps/use-suggestions-rust-2018/use-suggestions.rs rename to tests/run-make/use-suggestions-rust-2018/use-suggestions.rs diff --git a/tests/run-make-fulldeps/used-cdylib-macos/Makefile b/tests/run-make/used-cdylib-macos/Makefile similarity index 100% rename from tests/run-make-fulldeps/used-cdylib-macos/Makefile rename to tests/run-make/used-cdylib-macos/Makefile diff --git a/tests/run-make-fulldeps/used-cdylib-macos/dylib_used.rs b/tests/run-make/used-cdylib-macos/dylib_used.rs similarity index 100% rename from tests/run-make-fulldeps/used-cdylib-macos/dylib_used.rs rename to tests/run-make/used-cdylib-macos/dylib_used.rs diff --git a/tests/run-make-fulldeps/used/Makefile b/tests/run-make/used/Makefile similarity index 100% rename from tests/run-make-fulldeps/used/Makefile rename to tests/run-make/used/Makefile diff --git a/tests/run-make-fulldeps/used/used.rs b/tests/run-make/used/used.rs similarity index 100% rename from tests/run-make-fulldeps/used/used.rs rename to tests/run-make/used/used.rs diff --git a/tests/run-make/valid-print-requests/Makefile b/tests/run-make/valid-print-requests/Makefile index c325e536e7c5d..99430e98d1c2d 100644 --- a/tests/run-make/valid-print-requests/Makefile +++ b/tests/run-make/valid-print-requests/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk all: $(RUSTC) --print uwu 2>&1 | diff - valid-print-requests.stderr diff --git a/tests/run-make-fulldeps/version/Makefile b/tests/run-make/version/Makefile similarity index 100% rename from tests/run-make-fulldeps/version/Makefile rename to tests/run-make/version/Makefile diff --git a/tests/run-make-fulldeps/volatile-intrinsics/Makefile b/tests/run-make/volatile-intrinsics/Makefile similarity index 91% rename from tests/run-make-fulldeps/volatile-intrinsics/Makefile rename to tests/run-make/volatile-intrinsics/Makefile index 2a78c7b9cfe17..5672a045873dd 100644 --- a/tests/run-make-fulldeps/volatile-intrinsics/Makefile +++ b/tests/run-make/volatile-intrinsics/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/volatile-intrinsics/main.rs b/tests/run-make/volatile-intrinsics/main.rs similarity index 100% rename from tests/run-make-fulldeps/volatile-intrinsics/main.rs rename to tests/run-make/volatile-intrinsics/main.rs diff --git a/tests/run-make/wasm-abi/Makefile b/tests/run-make/wasm-abi/Makefile index e713ca1876d53..ed95464efef2e 100644 --- a/tests/run-make/wasm-abi/Makefile +++ b/tests/run-make/wasm-abi/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-wasm32-bare diff --git a/tests/run-make/wasm-custom-section/Makefile b/tests/run-make/wasm-custom-section/Makefile index 92b0802e30a61..2f7d38c273651 100644 --- a/tests/run-make/wasm-custom-section/Makefile +++ b/tests/run-make/wasm-custom-section/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-wasm32-bare diff --git a/tests/run-make/wasm-custom-sections-opt/Makefile b/tests/run-make/wasm-custom-sections-opt/Makefile index e5b45d96310f1..a0d4378131be5 100644 --- a/tests/run-make/wasm-custom-sections-opt/Makefile +++ b/tests/run-make/wasm-custom-sections-opt/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-wasm32-bare diff --git a/tests/run-make/wasm-export-all-symbols/Makefile b/tests/run-make/wasm-export-all-symbols/Makefile index 834f4d258db12..86713bc80b85a 100644 --- a/tests/run-make/wasm-export-all-symbols/Makefile +++ b/tests/run-make/wasm-export-all-symbols/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-wasm32-bare diff --git a/tests/run-make/wasm-import-module/Makefile b/tests/run-make/wasm-import-module/Makefile index 18cef16aac3a1..a0b4d920b3d0d 100644 --- a/tests/run-make/wasm-import-module/Makefile +++ b/tests/run-make/wasm-import-module/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-wasm32-bare diff --git a/tests/run-make/wasm-panic-small/Makefile b/tests/run-make/wasm-panic-small/Makefile index 2af9f71357e9a..16f545218556f 100644 --- a/tests/run-make/wasm-panic-small/Makefile +++ b/tests/run-make/wasm-panic-small/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-wasm32-bare diff --git a/tests/run-make/wasm-spurious-import/Makefile b/tests/run-make/wasm-spurious-import/Makefile index 6f50e6e554e7f..ff9dfeac6d00c 100644 --- a/tests/run-make/wasm-spurious-import/Makefile +++ b/tests/run-make/wasm-spurious-import/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-wasm32-bare diff --git a/tests/run-make/wasm-stringify-ints-small/Makefile b/tests/run-make/wasm-stringify-ints-small/Makefile index 2fa2c954d4a84..f959dbd426b9f 100644 --- a/tests/run-make/wasm-stringify-ints-small/Makefile +++ b/tests/run-make/wasm-stringify-ints-small/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk ifeq ($(TARGET),wasm32-unknown-unknown) all: diff --git a/tests/run-make/wasm-symbols-different-module/Makefile b/tests/run-make/wasm-symbols-different-module/Makefile index 9e657222deab1..0f86914c7b1f2 100644 --- a/tests/run-make/wasm-symbols-different-module/Makefile +++ b/tests/run-make/wasm-symbols-different-module/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-wasm32-bare diff --git a/tests/run-make/wasm-symbols-not-exported/Makefile b/tests/run-make/wasm-symbols-not-exported/Makefile index 60b0dee001fbf..024ad7797488d 100644 --- a/tests/run-make/wasm-symbols-not-exported/Makefile +++ b/tests/run-make/wasm-symbols-not-exported/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-wasm32-bare diff --git a/tests/run-make/wasm-symbols-not-imported/Makefile b/tests/run-make/wasm-symbols-not-imported/Makefile index dc7618c19a757..38440a8b0258c 100644 --- a/tests/run-make/wasm-symbols-not-imported/Makefile +++ b/tests/run-make/wasm-symbols-not-imported/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk # only-wasm32-bare diff --git a/tests/run-make-fulldeps/weird-output-filenames/Makefile b/tests/run-make/weird-output-filenames/Makefile similarity index 100% rename from tests/run-make-fulldeps/weird-output-filenames/Makefile rename to tests/run-make/weird-output-filenames/Makefile diff --git a/tests/run-make-fulldeps/weird-output-filenames/foo.rs b/tests/run-make/weird-output-filenames/foo.rs similarity index 100% rename from tests/run-make-fulldeps/weird-output-filenames/foo.rs rename to tests/run-make/weird-output-filenames/foo.rs diff --git a/tests/run-make-fulldeps/windows-binary-no-external-deps/Makefile b/tests/run-make/windows-binary-no-external-deps/Makefile similarity index 100% rename from tests/run-make-fulldeps/windows-binary-no-external-deps/Makefile rename to tests/run-make/windows-binary-no-external-deps/Makefile diff --git a/tests/run-make-fulldeps/windows-binary-no-external-deps/hello.rs b/tests/run-make/windows-binary-no-external-deps/hello.rs similarity index 100% rename from tests/run-make-fulldeps/windows-binary-no-external-deps/hello.rs rename to tests/run-make/windows-binary-no-external-deps/hello.rs diff --git a/tests/run-make-fulldeps/windows-spawn/Makefile b/tests/run-make/windows-spawn/Makefile similarity index 100% rename from tests/run-make-fulldeps/windows-spawn/Makefile rename to tests/run-make/windows-spawn/Makefile diff --git a/tests/run-make-fulldeps/windows-spawn/hello.rs b/tests/run-make/windows-spawn/hello.rs similarity index 100% rename from tests/run-make-fulldeps/windows-spawn/hello.rs rename to tests/run-make/windows-spawn/hello.rs diff --git a/tests/run-make-fulldeps/windows-spawn/spawn.rs b/tests/run-make/windows-spawn/spawn.rs similarity index 100% rename from tests/run-make-fulldeps/windows-spawn/spawn.rs rename to tests/run-make/windows-spawn/spawn.rs diff --git a/tests/run-make-fulldeps/windows-subsystem/Makefile b/tests/run-make/windows-subsystem/Makefile similarity index 74% rename from tests/run-make-fulldeps/windows-subsystem/Makefile rename to tests/run-make/windows-subsystem/Makefile index 78c4e2ac1e875..e3cf9181de418 100644 --- a/tests/run-make-fulldeps/windows-subsystem/Makefile +++ b/tests/run-make/windows-subsystem/Makefile @@ -1,3 +1,4 @@ +# ignore-cross-compile include ../tools.mk all: diff --git a/tests/run-make-fulldeps/windows-subsystem/console.rs b/tests/run-make/windows-subsystem/console.rs similarity index 100% rename from tests/run-make-fulldeps/windows-subsystem/console.rs rename to tests/run-make/windows-subsystem/console.rs diff --git a/tests/run-make-fulldeps/windows-subsystem/windows.rs b/tests/run-make/windows-subsystem/windows.rs similarity index 100% rename from tests/run-make-fulldeps/windows-subsystem/windows.rs rename to tests/run-make/windows-subsystem/windows.rs diff --git a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile index 84dcd2393517c..3c88ec34f431e 100644 --- a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile +++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile @@ -1,4 +1,4 @@ -include ../../run-make-fulldeps/tools.mk +include ../tools.mk #only-x86_64-fortanix-unknown-sgx