Auto merge of rust-lang#109770 - jyn514:run-make-fulldeps, r=Mark-Sim…

…ulacrum Move almost all run-make-fulldeps tests to run-make They pass fine, and this avoids having to build the compiler twice. There are few enough tests left that I think it should be possible to get rid of this test suite altogether, but I expect this PR to fail at least a few times in bors and want to get it merged before tackling further changes. cc rust-lang#83775 Fixes rust-lang#66085. Fixes rust-lang#83773.
rust-lang-ci · Apr 3, 2023 · 3328913 · 3328913
2 parents a93bcdc + c45037b
commit 3328913
Show file tree

Hide file tree

Showing 774 changed files with 226 additions and 95 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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/...make-fulldeps/a-b-a-linker-guard/Makefile → tests/run-make/a-b-a-linker-guard/Makefile b/...make-fulldeps/a-b-a-linker-guard/Makefile → 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/...run-make-fulldeps/a-b-a-linker-guard/a.rs → tests/run-make/a-b-a-linker-guard/a.rs b/...run-make-fulldeps/a-b-a-linker-guard/a.rs → tests/run-make/a-b-a-linker-guard/a.rs
diff --git a/...run-make-fulldeps/a-b-a-linker-guard/b.rs → tests/run-make/a-b-a-linker-guard/b.rs b/...run-make-fulldeps/a-b-a-linker-guard/b.rs → tests/run-make/a-b-a-linker-guard/b.rs
diff --git a/...e-fulldeps/alloc-no-oom-handling/Makefile → ...s/run-make/alloc-no-oom-handling/Makefile b/...e-fulldeps/alloc-no-oom-handling/Makefile → ...s/run-make/alloc-no-oom-handling/Makefile
diff --git a/tests/run-make-fulldeps/alloc-no-rc/Makefile → tests/run-make/alloc-no-rc/Makefile b/tests/run-make-fulldeps/alloc-no-rc/Makefile → tests/run-make/alloc-no-rc/Makefile
diff --git a/.../run-make-fulldeps/alloc-no-sync/Makefile → tests/run-make/alloc-no-sync/Makefile b/.../run-make-fulldeps/alloc-no-sync/Makefile → tests/run-make/alloc-no-sync/Makefile
diff --git a/.../allow-non-lint-warnings-cmdline/Makefile → .../allow-non-lint-warnings-cmdline/Makefile b/.../allow-non-lint-warnings-cmdline/Makefile → .../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/...ps/allow-non-lint-warnings-cmdline/foo.rs → ...ke/allow-non-lint-warnings-cmdline/foo.rs b/...ps/allow-non-lint-warnings-cmdline/foo.rs → ...ke/allow-non-lint-warnings-cmdline/foo.rs
diff --git a/...allow-warnings-cmdline-stability/Makefile → ...allow-warnings-cmdline-stability/Makefile b/...allow-warnings-cmdline-stability/Makefile → ...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/...s/allow-warnings-cmdline-stability/bar.rs → ...e/allow-warnings-cmdline-stability/bar.rs b/...s/allow-warnings-cmdline-stability/bar.rs → ...e/allow-warnings-cmdline-stability/bar.rs
diff --git a/...s/allow-warnings-cmdline-stability/foo.rs → ...e/allow-warnings-cmdline-stability/foo.rs b/...s/allow-warnings-cmdline-stability/foo.rs → ...e/allow-warnings-cmdline-stability/foo.rs
diff --git a/...fulldeps/archive-duplicate-names/Makefile → ...run-make/archive-duplicate-names/Makefile b/...fulldeps/archive-duplicate-names/Makefile → ...run-make/archive-duplicate-names/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...ke-fulldeps/archive-duplicate-names/bar.c → tests/run-make/archive-duplicate-names/bar.c b/...ke-fulldeps/archive-duplicate-names/bar.c → tests/run-make/archive-duplicate-names/bar.c
diff --git a/...e-fulldeps/archive-duplicate-names/bar.rs → ...s/run-make/archive-duplicate-names/bar.rs b/...e-fulldeps/archive-duplicate-names/bar.rs → ...s/run-make/archive-duplicate-names/bar.rs
diff --git a/...ke-fulldeps/archive-duplicate-names/foo.c → tests/run-make/archive-duplicate-names/foo.c b/...ke-fulldeps/archive-duplicate-names/foo.c → tests/run-make/archive-duplicate-names/foo.c
diff --git a/...e-fulldeps/archive-duplicate-names/foo.rs → ...s/run-make/archive-duplicate-names/foo.rs b/...e-fulldeps/archive-duplicate-names/foo.rs → ...s/run-make/archive-duplicate-names/foo.rs
diff --git a/...lldeps/arguments-non-c-like-enum/Makefile → ...n-make/arguments-non-c-like-enum/Makefile b/...lldeps/arguments-non-c-like-enum/Makefile → ...n-make/arguments-non-c-like-enum/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...eps/arguments-non-c-like-enum/nonclike.rs → ...ake/arguments-non-c-like-enum/nonclike.rs b/...eps/arguments-non-c-like-enum/nonclike.rs → ...ake/arguments-non-c-like-enum/nonclike.rs
diff --git a/...fulldeps/arguments-non-c-like-enum/test.c → ...run-make/arguments-non-c-like-enum/test.c b/...fulldeps/arguments-non-c-like-enum/test.c → ...run-make/arguments-non-c-like-enum/test.c
diff --git a/...n-make-fulldeps/atomic-lock-free/Makefile → tests/run-make/atomic-lock-free/Makefile b/...n-make-fulldeps/atomic-lock-free/Makefile → tests/run-make/atomic-lock-free/Makefile
diff --git a/...deps/atomic-lock-free/atomic_lock_free.rs → ...make/atomic-lock-free/atomic_lock_free.rs b/...deps/atomic-lock-free/atomic_lock_free.rs → ...make/atomic-lock-free/atomic_lock_free.rs
diff --git a/...s/run-make-fulldeps/bare-outfile/Makefile → tests/run-make/bare-outfile/Makefile b/...s/run-make-fulldeps/bare-outfile/Makefile → 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 → tests/run-make/bare-outfile/foo.rs b/tests/run-make-fulldeps/bare-outfile/foo.rs → tests/run-make/bare-outfile/foo.rs
diff --git a/...un-make-fulldeps/c-dynamic-dylib/Makefile → tests/run-make/c-dynamic-dylib/Makefile b/...un-make-fulldeps/c-dynamic-dylib/Makefile → tests/run-make/c-dynamic-dylib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-macos

diff --git a/.../run-make-fulldeps/c-dynamic-dylib/bar.rs → tests/run-make/c-dynamic-dylib/bar.rs b/.../run-make-fulldeps/c-dynamic-dylib/bar.rs → tests/run-make/c-dynamic-dylib/bar.rs
diff --git a/.../run-make-fulldeps/c-dynamic-dylib/cfoo.c → tests/run-make/c-dynamic-dylib/cfoo.c b/.../run-make-fulldeps/c-dynamic-dylib/cfoo.c → tests/run-make/c-dynamic-dylib/cfoo.c
diff --git a/.../run-make-fulldeps/c-dynamic-dylib/foo.rs → tests/run-make/c-dynamic-dylib/foo.rs b/.../run-make-fulldeps/c-dynamic-dylib/foo.rs → tests/run-make/c-dynamic-dylib/foo.rs
diff --git a/...run-make-fulldeps/c-dynamic-rlib/Makefile → tests/run-make/c-dynamic-rlib/Makefile b/...run-make-fulldeps/c-dynamic-rlib/Makefile → tests/run-make/c-dynamic-rlib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-macos

diff --git a/...s/run-make-fulldeps/c-dynamic-rlib/bar.rs → tests/run-make/c-dynamic-rlib/bar.rs b/...s/run-make-fulldeps/c-dynamic-rlib/bar.rs → tests/run-make/c-dynamic-rlib/bar.rs
diff --git a/...s/run-make-fulldeps/c-dynamic-rlib/cfoo.c → tests/run-make/c-dynamic-rlib/cfoo.c b/...s/run-make-fulldeps/c-dynamic-rlib/cfoo.c → tests/run-make/c-dynamic-rlib/cfoo.c
diff --git a/...s/run-make-fulldeps/c-dynamic-rlib/foo.rs → tests/run-make/c-dynamic-rlib/foo.rs b/...s/run-make-fulldeps/c-dynamic-rlib/foo.rs → tests/run-make/c-dynamic-rlib/foo.rs
diff --git a/...ke-fulldeps/c-link-to-rust-dylib/Makefile → tests/run-make/c-link-to-rust-dylib/Makefile b/...ke-fulldeps/c-link-to-rust-dylib/Makefile → 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/...-make-fulldeps/c-link-to-rust-dylib/bar.c → tests/run-make/c-link-to-rust-dylib/bar.c b/...-make-fulldeps/c-link-to-rust-dylib/bar.c → tests/run-make/c-link-to-rust-dylib/bar.c
diff --git a/...make-fulldeps/c-link-to-rust-dylib/foo.rs → tests/run-make/c-link-to-rust-dylib/foo.rs b/...make-fulldeps/c-link-to-rust-dylib/foo.rs → tests/run-make/c-link-to-rust-dylib/foo.rs
diff --git a/...ulldeps/c-link-to-rust-staticlib/Makefile → ...un-make/c-link-to-rust-staticlib/Makefile b/...ulldeps/c-link-to-rust-staticlib/Makefile → ...un-make/c-link-to-rust-staticlib/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-freebsd

diff --git a/...e-fulldeps/c-link-to-rust-staticlib/bar.c → ...s/run-make/c-link-to-rust-staticlib/bar.c b/...e-fulldeps/c-link-to-rust-staticlib/bar.c → ...s/run-make/c-link-to-rust-staticlib/bar.c
diff --git a/...-fulldeps/c-link-to-rust-staticlib/foo.rs → .../run-make/c-link-to-rust-staticlib/foo.rs b/...-fulldeps/c-link-to-rust-staticlib/foo.rs → .../run-make/c-link-to-rust-staticlib/foo.rs
diff --git a/...lldeps/c-link-to-rust-va-list-fn/Makefile → ...n-make/c-link-to-rust-va-list-fn/Makefile b/...lldeps/c-link-to-rust-va-list-fn/Makefile → ...n-make/c-link-to-rust-va-list-fn/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...ps/c-link-to-rust-va-list-fn/checkrust.rs → ...ke/c-link-to-rust-va-list-fn/checkrust.rs b/...ps/c-link-to-rust-va-list-fn/checkrust.rs → ...ke/c-link-to-rust-va-list-fn/checkrust.rs
diff --git a/...fulldeps/c-link-to-rust-va-list-fn/test.c → ...run-make/c-link-to-rust-va-list-fn/test.c b/...fulldeps/c-link-to-rust-va-list-fn/test.c → ...run-make/c-link-to-rust-va-list-fn/test.c
diff --git a/...run-make-fulldeps/c-static-dylib/Makefile → tests/run-make/c-static-dylib/Makefile b/...run-make-fulldeps/c-static-dylib/Makefile → 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/...s/run-make-fulldeps/c-static-dylib/bar.rs → tests/run-make/c-static-dylib/bar.rs b/...s/run-make-fulldeps/c-static-dylib/bar.rs → tests/run-make/c-static-dylib/bar.rs
diff --git a/...s/run-make-fulldeps/c-static-dylib/cfoo.c → tests/run-make/c-static-dylib/cfoo.c b/...s/run-make-fulldeps/c-static-dylib/cfoo.c → tests/run-make/c-static-dylib/cfoo.c
diff --git a/...s/run-make-fulldeps/c-static-dylib/foo.rs → tests/run-make/c-static-dylib/foo.rs b/...s/run-make-fulldeps/c-static-dylib/foo.rs → tests/run-make/c-static-dylib/foo.rs
diff --git a/.../run-make-fulldeps/c-static-rlib/Makefile → tests/run-make/c-static-rlib/Makefile b/.../run-make-fulldeps/c-static-rlib/Makefile → 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 → tests/run-make/c-static-rlib/bar.rs b/tests/run-make-fulldeps/c-static-rlib/bar.rs → tests/run-make/c-static-rlib/bar.rs
diff --git a/tests/run-make-fulldeps/c-static-rlib/cfoo.c → tests/run-make/c-static-rlib/cfoo.c b/tests/run-make-fulldeps/c-static-rlib/cfoo.c → tests/run-make/c-static-rlib/cfoo.c
diff --git a/tests/run-make-fulldeps/c-static-rlib/foo.rs → tests/run-make/c-static-rlib/foo.rs b/tests/run-make-fulldeps/c-static-rlib/foo.rs → tests/run-make/c-static-rlib/foo.rs
diff --git a/...eps/c-unwind-abi-catch-lib-panic/Makefile → ...ake/c-unwind-abi-catch-lib-panic/Makefile b/...eps/c-unwind-abi-catch-lib-panic/Makefile → ...ake/c-unwind-abi-catch-lib-panic/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: archive

diff --git a/...lldeps/c-unwind-abi-catch-lib-panic/add.c → ...n-make/c-unwind-abi-catch-lib-panic/add.c b/...lldeps/c-unwind-abi-catch-lib-panic/add.c → ...n-make/c-unwind-abi-catch-lib-panic/add.c
diff --git a/...deps/c-unwind-abi-catch-lib-panic/main.rs → ...make/c-unwind-abi-catch-lib-panic/main.rs b/...deps/c-unwind-abi-catch-lib-panic/main.rs → ...make/c-unwind-abi-catch-lib-panic/main.rs
diff --git a/...eps/c-unwind-abi-catch-lib-panic/panic.rs → ...ake/c-unwind-abi-catch-lib-panic/panic.rs b/...eps/c-unwind-abi-catch-lib-panic/panic.rs → ...ake/c-unwind-abi-catch-lib-panic/panic.rs
diff --git a/...ulldeps/c-unwind-abi-catch-panic/Makefile → ...un-make/c-unwind-abi-catch-panic/Makefile b/...ulldeps/c-unwind-abi-catch-panic/Makefile → ...un-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/...e-fulldeps/c-unwind-abi-catch-panic/add.c → ...s/run-make/c-unwind-abi-catch-panic/add.c b/...e-fulldeps/c-unwind-abi-catch-panic/add.c → ...s/run-make/c-unwind-abi-catch-panic/add.c
diff --git a/...fulldeps/c-unwind-abi-catch-panic/main.rs → ...run-make/c-unwind-abi-catch-panic/main.rs b/...fulldeps/c-unwind-abi-catch-panic/main.rs → ...run-make/c-unwind-abi-catch-panic/main.rs
diff --git a/...lldeps/cat-and-grep-sanity-check/Makefile → ...n-make/cat-and-grep-sanity-check/Makefile b/...lldeps/cat-and-grep-sanity-check/Makefile → ...n-make/cat-and-grep-sanity-check/Makefile
diff --git a/...ke-fulldeps/cdylib-dylib-linkage/Makefile → tests/run-make/cdylib-dylib-linkage/Makefile b/...ke-fulldeps/cdylib-dylib-linkage/Makefile → 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/...make-fulldeps/cdylib-dylib-linkage/bar.rs → tests/run-make/cdylib-dylib-linkage/bar.rs b/...make-fulldeps/cdylib-dylib-linkage/bar.rs → tests/run-make/cdylib-dylib-linkage/bar.rs
diff --git a/...-make-fulldeps/cdylib-dylib-linkage/foo.c → tests/run-make/cdylib-dylib-linkage/foo.c b/...-make-fulldeps/cdylib-dylib-linkage/foo.c → tests/run-make/cdylib-dylib-linkage/foo.c
diff --git a/...make-fulldeps/cdylib-dylib-linkage/foo.rs → tests/run-make/cdylib-dylib-linkage/foo.rs b/...make-fulldeps/cdylib-dylib-linkage/foo.rs → tests/run-make/cdylib-dylib-linkage/foo.rs
diff --git a/...ke-fulldeps/cdylib-fewer-symbols/Makefile → tests/run-make/cdylib-fewer-symbols/Makefile b/...ke-fulldeps/cdylib-fewer-symbols/Makefile → 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/...make-fulldeps/cdylib-fewer-symbols/foo.rs → tests/run-make/cdylib-fewer-symbols/foo.rs b/...make-fulldeps/cdylib-fewer-symbols/foo.rs → tests/run-make/cdylib-fewer-symbols/foo.rs
diff --git a/tests/run-make-fulldeps/cdylib/Makefile → tests/run-make/cdylib/Makefile b/tests/run-make-fulldeps/cdylib/Makefile → 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 → tests/run-make/cdylib/bar.rs b/tests/run-make-fulldeps/cdylib/bar.rs → tests/run-make/cdylib/bar.rs
diff --git a/tests/run-make-fulldeps/cdylib/foo.c → tests/run-make/cdylib/foo.c b/tests/run-make-fulldeps/cdylib/foo.c → tests/run-make/cdylib/foo.c
diff --git a/tests/run-make-fulldeps/cdylib/foo.rs → tests/run-make/cdylib/foo.rs b/tests/run-make-fulldeps/cdylib/foo.rs → tests/run-make/cdylib/foo.rs
diff --git a/...fulldeps/codegen-options-parsing/Makefile → ...run-make/codegen-options-parsing/Makefile b/...fulldeps/codegen-options-parsing/Makefile → ...run-make/codegen-options-parsing/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...fulldeps/codegen-options-parsing/dummy.rs → ...run-make/codegen-options-parsing/dummy.rs b/...fulldeps/codegen-options-parsing/dummy.rs → ...run-make/codegen-options-parsing/dummy.rs
diff --git a/.../run-make-fulldeps/compile-stdin/Makefile → tests/run-make/compile-stdin/Makefile b/.../run-make-fulldeps/compile-stdin/Makefile → tests/run-make/compile-stdin/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...fulldeps/compiler-lookup-paths-2/Makefile → ...run-make/compiler-lookup-paths-2/Makefile b/...fulldeps/compiler-lookup-paths-2/Makefile → ...run-make/compiler-lookup-paths-2/Makefile
diff --git a/...ake-fulldeps/compiler-lookup-paths-2/a.rs → tests/run-make/compiler-lookup-paths-2/a.rs b/...ake-fulldeps/compiler-lookup-paths-2/a.rs → tests/run-make/compiler-lookup-paths-2/a.rs
diff --git a/...ake-fulldeps/compiler-lookup-paths-2/b.rs → tests/run-make/compiler-lookup-paths-2/b.rs b/...ake-fulldeps/compiler-lookup-paths-2/b.rs → tests/run-make/compiler-lookup-paths-2/b.rs
diff --git a/...ake-fulldeps/compiler-lookup-paths-2/c.rs → tests/run-make/compiler-lookup-paths-2/c.rs b/...ake-fulldeps/compiler-lookup-paths-2/c.rs → tests/run-make/compiler-lookup-paths-2/c.rs
diff --git a/...e-fulldeps/compiler-lookup-paths/Makefile → ...s/run-make/compiler-lookup-paths/Makefile b/...e-fulldeps/compiler-lookup-paths/Makefile → ...s/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/...-make-fulldeps/compiler-lookup-paths/a.rs → tests/run-make/compiler-lookup-paths/a.rs b/...-make-fulldeps/compiler-lookup-paths/a.rs → tests/run-make/compiler-lookup-paths/a.rs
diff --git a/...-make-fulldeps/compiler-lookup-paths/b.rs → tests/run-make/compiler-lookup-paths/b.rs b/...-make-fulldeps/compiler-lookup-paths/b.rs → tests/run-make/compiler-lookup-paths/b.rs
diff --git a/...-make-fulldeps/compiler-lookup-paths/c.rs → tests/run-make/compiler-lookup-paths/c.rs b/...-make-fulldeps/compiler-lookup-paths/c.rs → tests/run-make/compiler-lookup-paths/c.rs
diff --git a/...-make-fulldeps/compiler-lookup-paths/d.rs → tests/run-make/compiler-lookup-paths/d.rs b/...-make-fulldeps/compiler-lookup-paths/d.rs → tests/run-make/compiler-lookup-paths/d.rs
diff --git a/...-make-fulldeps/compiler-lookup-paths/e.rs → tests/run-make/compiler-lookup-paths/e.rs b/...-make-fulldeps/compiler-lookup-paths/e.rs → tests/run-make/compiler-lookup-paths/e.rs
diff --git a/...make-fulldeps/compiler-lookup-paths/e2.rs → tests/run-make/compiler-lookup-paths/e2.rs b/...make-fulldeps/compiler-lookup-paths/e2.rs → tests/run-make/compiler-lookup-paths/e2.rs
diff --git a/...-make-fulldeps/compiler-lookup-paths/f.rs → tests/run-make/compiler-lookup-paths/f.rs b/...-make-fulldeps/compiler-lookup-paths/f.rs → tests/run-make/compiler-lookup-paths/f.rs
diff --git a/...e-fulldeps/compiler-lookup-paths/native.c → ...s/run-make/compiler-lookup-paths/native.c b/...e-fulldeps/compiler-lookup-paths/native.c → ...s/run-make/compiler-lookup-paths/native.c
diff --git a/...ldeps/compiler-rt-works-on-mingw/Makefile → ...-make/compiler-rt-works-on-mingw/Makefile b/...ldeps/compiler-rt-works-on-mingw/Makefile → ...-make/compiler-rt-works-on-mingw/Makefile
diff --git a/...lldeps/compiler-rt-works-on-mingw/foo.cpp → ...n-make/compiler-rt-works-on-mingw/foo.cpp b/...lldeps/compiler-rt-works-on-mingw/foo.cpp → ...n-make/compiler-rt-works-on-mingw/foo.cpp
diff --git a/...ulldeps/compiler-rt-works-on-mingw/foo.rs → ...un-make/compiler-rt-works-on-mingw/foo.rs b/...ulldeps/compiler-rt-works-on-mingw/foo.rs → ...un-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
@@ -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/...ke-fulldeps/core-no-fp-fmt-parse/Makefile → tests/run-make/core-no-fp-fmt-parse/Makefile b/...ke-fulldeps/core-no-fp-fmt-parse/Makefile → 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
@@ -3,4 +3,4 @@
 #
 # include ../coverage/coverage_tools.mk
 
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
diff --git a/...n-make-fulldeps/crate-data-smoke/Makefile → tests/run-make/crate-data-smoke/Makefile b/...n-make-fulldeps/crate-data-smoke/Makefile → tests/run-make/crate-data-smoke/Makefile
diff --git a/...n-make-fulldeps/crate-data-smoke/crate.rs → tests/run-make/crate-data-smoke/crate.rs b/...n-make-fulldeps/crate-data-smoke/crate.rs → tests/run-make/crate-data-smoke/crate.rs
diff --git a/...run-make-fulldeps/crate-data-smoke/lib.rs → tests/run-make/crate-data-smoke/lib.rs b/...run-make-fulldeps/crate-data-smoke/lib.rs → tests/run-make/crate-data-smoke/lib.rs
diff --git a/...un-make-fulldeps/crate-data-smoke/rlib.rs → tests/run-make/crate-data-smoke/rlib.rs b/...un-make-fulldeps/crate-data-smoke/rlib.rs → tests/run-make/crate-data-smoke/rlib.rs
diff --git a/...ulldeps/crate-hash-rustc-version/Makefile → ...un-make/crate-hash-rustc-version/Makefile b/...ulldeps/crate-hash-rustc-version/Makefile → ...un-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/...ke-fulldeps/crate-hash-rustc-version/a.rs → tests/run-make/crate-hash-rustc-version/a.rs b/...ke-fulldeps/crate-hash-rustc-version/a.rs → tests/run-make/crate-hash-rustc-version/a.rs
diff --git a/...ke-fulldeps/crate-hash-rustc-version/b.rs → tests/run-make/crate-hash-rustc-version/b.rs b/...ke-fulldeps/crate-hash-rustc-version/b.rs → tests/run-make/crate-hash-rustc-version/b.rs
diff --git a/...ake-fulldeps/crate-name-priority/Makefile → tests/run-make/crate-name-priority/Makefile b/...ake-fulldeps/crate-name-priority/Makefile → tests/run-make/crate-name-priority/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...-make-fulldeps/crate-name-priority/foo.rs → tests/run-make/crate-name-priority/foo.rs b/...-make-fulldeps/crate-name-priority/foo.rs → tests/run-make/crate-name-priority/foo.rs
diff --git a/...make-fulldeps/crate-name-priority/foo1.rs → tests/run-make/crate-name-priority/foo1.rs b/...make-fulldeps/crate-name-priority/foo1.rs → tests/run-make/crate-name-priority/foo1.rs
diff --git a/...ke-fulldeps/cross-lang-lto-clang/Makefile → tests/run-make/cross-lang-lto-clang/Makefile b/...ke-fulldeps/cross-lang-lto-clang/Makefile → tests/run-make/cross-lang-lto-clang/Makefile
diff --git a/...make-fulldeps/cross-lang-lto-clang/clib.c → tests/run-make/cross-lang-lto-clang/clib.c b/...make-fulldeps/cross-lang-lto-clang/clib.c → tests/run-make/cross-lang-lto-clang/clib.c
diff --git a/...ake-fulldeps/cross-lang-lto-clang/cmain.c → tests/run-make/cross-lang-lto-clang/cmain.c b/...ake-fulldeps/cross-lang-lto-clang/cmain.c → tests/run-make/cross-lang-lto-clang/cmain.c
diff --git a/...ake-fulldeps/cross-lang-lto-clang/main.rs → tests/run-make/cross-lang-lto-clang/main.rs b/...ake-fulldeps/cross-lang-lto-clang/main.rs → tests/run-make/cross-lang-lto-clang/main.rs
diff --git a/...-fulldeps/cross-lang-lto-clang/rustlib.rs → .../run-make/cross-lang-lto-clang/rustlib.rs b/...-fulldeps/cross-lang-lto-clang/rustlib.rs → .../run-make/cross-lang-lto-clang/rustlib.rs
diff --git a/...eps/cross-lang-lto-pgo-smoketest/Makefile → ...ake/cross-lang-lto-pgo-smoketest/Makefile b/...eps/cross-lang-lto-pgo-smoketest/Makefile → ...ake/cross-lang-lto-pgo-smoketest/Makefile
diff --git a/...ldeps/cross-lang-lto-pgo-smoketest/clib.c → ...-make/cross-lang-lto-pgo-smoketest/clib.c b/...ldeps/cross-lang-lto-pgo-smoketest/clib.c → ...-make/cross-lang-lto-pgo-smoketest/clib.c
diff --git a/...deps/cross-lang-lto-pgo-smoketest/cmain.c → ...make/cross-lang-lto-pgo-smoketest/cmain.c b/...deps/cross-lang-lto-pgo-smoketest/cmain.c → ...make/cross-lang-lto-pgo-smoketest/cmain.c
diff --git a/...deps/cross-lang-lto-pgo-smoketest/main.rs → ...make/cross-lang-lto-pgo-smoketest/main.rs b/...deps/cross-lang-lto-pgo-smoketest/main.rs → ...make/cross-lang-lto-pgo-smoketest/main.rs
diff --git a/...s/cross-lang-lto-pgo-smoketest/rustlib.rs → ...e/cross-lang-lto-pgo-smoketest/rustlib.rs b/...s/cross-lang-lto-pgo-smoketest/rustlib.rs → ...e/cross-lang-lto-pgo-smoketest/rustlib.rs
diff --git a/...ps/cross-lang-lto-upstream-rlibs/Makefile → ...ke/cross-lang-lto-upstream-rlibs/Makefile b/...ps/cross-lang-lto-upstream-rlibs/Makefile → ...ke/cross-lang-lto-upstream-rlibs/Makefile
diff --git a/...ross-lang-lto-upstream-rlibs/staticlib.rs → ...ross-lang-lto-upstream-rlibs/staticlib.rs b/...ross-lang-lto-upstream-rlibs/staticlib.rs → ...ross-lang-lto-upstream-rlibs/staticlib.rs
diff --git a/...cross-lang-lto-upstream-rlibs/upstream.rs → ...cross-lang-lto-upstream-rlibs/upstream.rs b/...cross-lang-lto-upstream-rlibs/upstream.rs → ...cross-lang-lto-upstream-rlibs/upstream.rs
diff --git a/...run-make-fulldeps/cross-lang-lto/Makefile → tests/run-make/cross-lang-lto/Makefile b/...run-make-fulldeps/cross-lang-lto/Makefile → tests/run-make/cross-lang-lto/Makefile
diff --git a/...s/run-make-fulldeps/cross-lang-lto/lib.rs → tests/run-make/cross-lang-lto/lib.rs b/...s/run-make-fulldeps/cross-lang-lto/lib.rs → tests/run-make/cross-lang-lto/lib.rs
diff --git a/.../run-make-fulldeps/cross-lang-lto/main.rs → tests/run-make/cross-lang-lto/main.rs b/.../run-make-fulldeps/cross-lang-lto/main.rs → tests/run-make/cross-lang-lto/main.rs
diff --git a/...n-make-fulldeps/debug-assertions/Makefile → tests/run-make/debug-assertions/Makefile b/...n-make-fulldeps/debug-assertions/Makefile → tests/run-make/debug-assertions/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...n-make-fulldeps/debug-assertions/debug.rs → tests/run-make/debug-assertions/debug.rs b/...n-make-fulldeps/debug-assertions/debug.rs → tests/run-make/debug-assertions/debug.rs
diff --git 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/...ulldeps/dep-info-doesnt-run-much/Makefile → ...un-make/dep-info-doesnt-run-much/Makefile b/...ulldeps/dep-info-doesnt-run-much/Makefile → ...un-make/dep-info-doesnt-run-much/Makefile
diff --git a/...-fulldeps/dep-info-doesnt-run-much/foo.rs → .../run-make/dep-info-doesnt-run-much/foo.rs b/...-fulldeps/dep-info-doesnt-run-much/foo.rs → .../run-make/dep-info-doesnt-run-much/foo.rs
diff --git a/...un-make-fulldeps/dep-info-spaces/Makefile → tests/run-make/dep-info-spaces/Makefile b/...un-make-fulldeps/dep-info-spaces/Makefile → tests/run-make/dep-info-spaces/Makefile
diff --git a/...ake-fulldeps/dep-info-spaces/Makefile.foo → tests/run-make/dep-info-spaces/Makefile.foo b/...ake-fulldeps/dep-info-spaces/Makefile.foo → tests/run-make/dep-info-spaces/Makefile.foo
diff --git a/.../run-make-fulldeps/dep-info-spaces/bar.rs → tests/run-make/dep-info-spaces/bar.rs b/.../run-make-fulldeps/dep-info-spaces/bar.rs → tests/run-make/dep-info-spaces/bar.rs
diff --git a/...-make-fulldeps/dep-info-spaces/foo foo.rs → tests/run-make/dep-info-spaces/foo foo.rs b/...-make-fulldeps/dep-info-spaces/foo foo.rs → tests/run-make/dep-info-spaces/foo foo.rs
diff --git a/.../run-make-fulldeps/dep-info-spaces/lib.rs → tests/run-make/dep-info-spaces/lib.rs b/.../run-make-fulldeps/dep-info-spaces/lib.rs → tests/run-make/dep-info-spaces/lib.rs
diff --git a/tests/run-make-fulldeps/dep-info/Makefile → tests/run-make/dep-info/Makefile b/tests/run-make-fulldeps/dep-info/Makefile → tests/run-make/dep-info/Makefile
diff --git a/...s/run-make-fulldeps/dep-info/Makefile.foo → tests/run-make/dep-info/Makefile.foo b/...s/run-make-fulldeps/dep-info/Makefile.foo → tests/run-make/dep-info/Makefile.foo
diff --git a/tests/run-make-fulldeps/dep-info/bar.rs → tests/run-make/dep-info/bar.rs b/tests/run-make-fulldeps/dep-info/bar.rs → tests/run-make/dep-info/bar.rs
diff --git a/tests/run-make-fulldeps/dep-info/foo.rs → tests/run-make/dep-info/foo.rs b/tests/run-make-fulldeps/dep-info/foo.rs → tests/run-make/dep-info/foo.rs
diff --git a/tests/run-make-fulldeps/dep-info/lib.rs → tests/run-make/dep-info/lib.rs b/tests/run-make-fulldeps/dep-info/lib.rs → tests/run-make/dep-info/lib.rs
diff --git a/tests/run-make-fulldeps/dep-info/lib2.rs → tests/run-make/dep-info/lib2.rs b/tests/run-make-fulldeps/dep-info/lib2.rs → tests/run-make/dep-info/lib2.rs
diff --git a/...-fulldeps/doctests-keep-binaries/Makefile → .../run-make/doctests-keep-binaries/Makefile b/...-fulldeps/doctests-keep-binaries/Makefile → .../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/...make-fulldeps/doctests-keep-binaries/t.rs → tests/run-make/doctests-keep-binaries/t.rs b/...make-fulldeps/doctests-keep-binaries/t.rs → 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
@@ -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/...ulldeps/duplicate-output-flavors/Makefile → ...un-make/duplicate-output-flavors/Makefile b/...ulldeps/duplicate-output-flavors/Makefile → ...un-make/duplicate-output-flavors/Makefile
diff --git a/...-fulldeps/duplicate-output-flavors/foo.rs → .../run-make/duplicate-output-flavors/foo.rs b/...-fulldeps/duplicate-output-flavors/foo.rs → .../run-make/duplicate-output-flavors/foo.rs
diff --git a/tests/run-make-fulldeps/dylib-chain/Makefile → tests/run-make/dylib-chain/Makefile b/tests/run-make-fulldeps/dylib-chain/Makefile → 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 → tests/run-make/dylib-chain/m1.rs b/tests/run-make-fulldeps/dylib-chain/m1.rs → tests/run-make/dylib-chain/m1.rs
diff --git a/tests/run-make-fulldeps/dylib-chain/m2.rs → tests/run-make/dylib-chain/m2.rs b/tests/run-make-fulldeps/dylib-chain/m2.rs → tests/run-make/dylib-chain/m2.rs
diff --git a/tests/run-make-fulldeps/dylib-chain/m3.rs → tests/run-make/dylib-chain/m3.rs b/tests/run-make-fulldeps/dylib-chain/m3.rs → tests/run-make/dylib-chain/m3.rs
diff --git a/tests/run-make-fulldeps/dylib-chain/m4.rs → tests/run-make/dylib-chain/m4.rs b/tests/run-make-fulldeps/dylib-chain/m4.rs → 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
@@ -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
@@ -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
@@ -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/...n-make-fulldeps/emit-stack-sizes/Makefile → tests/run-make/emit-stack-sizes/Makefile b/...n-make-fulldeps/emit-stack-sizes/Makefile → tests/run-make/emit-stack-sizes/Makefile
diff --git a/...run-make-fulldeps/emit-stack-sizes/foo.rs → tests/run-make/emit-stack-sizes/foo.rs b/...run-make-fulldeps/emit-stack-sizes/foo.rs → tests/run-make/emit-stack-sizes/foo.rs
diff --git a/tests/run-make-fulldeps/emit/Makefile → tests/run-make/emit/Makefile b/tests/run-make-fulldeps/emit/Makefile → 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 → tests/run-make/emit/test-24876.rs b/tests/run-make-fulldeps/emit/test-24876.rs → tests/run-make/emit/test-24876.rs
diff --git a/tests/run-make-fulldeps/emit/test-26235.rs → tests/run-make/emit/test-26235.rs b/tests/run-make-fulldeps/emit/test-26235.rs → 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
@@ -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/...or-found-staticlib-instead-crate/Makefile → ...or-found-staticlib-instead-crate/Makefile b/...or-found-staticlib-instead-crate/Makefile → ...or-found-staticlib-instead-crate/Makefile
diff --git a/...rror-found-staticlib-instead-crate/bar.rs → ...rror-found-staticlib-instead-crate/bar.rs b/...rror-found-staticlib-instead-crate/bar.rs → ...rror-found-staticlib-instead-crate/bar.rs
diff --git a/...rror-found-staticlib-instead-crate/foo.rs → ...rror-found-staticlib-instead-crate/foo.rs b/...rror-found-staticlib-instead-crate/foo.rs → ...rror-found-staticlib-instead-crate/foo.rs
diff --git a/...ldeps/error-writing-dependencies/Makefile → ...-make/error-writing-dependencies/Makefile b/...ldeps/error-writing-dependencies/Makefile → ...-make/error-writing-dependencies/Makefile
diff --git a/...ulldeps/error-writing-dependencies/foo.rs → ...un-make/error-writing-dependencies/foo.rs b/...ulldeps/error-writing-dependencies/foo.rs → ...un-make/error-writing-dependencies/foo.rs
diff --git a/tests/run-make-fulldeps/exit-code/Makefile → tests/run-make/exit-code/Makefile b/tests/run-make-fulldeps/exit-code/Makefile → tests/run-make/exit-code/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...-make-fulldeps/exit-code/compile-error.rs → tests/run-make/exit-code/compile-error.rs b/...-make-fulldeps/exit-code/compile-error.rs → tests/run-make/exit-code/compile-error.rs
diff --git a/...n-make-fulldeps/exit-code/lint-failure.rs → tests/run-make/exit-code/lint-failure.rs b/...n-make-fulldeps/exit-code/lint-failure.rs → tests/run-make/exit-code/lint-failure.rs
diff --git a/tests/run-make-fulldeps/exit-code/success.rs → tests/run-make/exit-code/success.rs b/tests/run-make-fulldeps/exit-code/success.rs → 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
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-wasm32
 # ignore-wasm64

diff --git a/...lldeps/extern-diff-internal-name/Makefile → ...n-make/extern-diff-internal-name/Makefile b/...lldeps/extern-diff-internal-name/Makefile → ...n-make/extern-diff-internal-name/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...fulldeps/extern-diff-internal-name/lib.rs → ...run-make/extern-diff-internal-name/lib.rs b/...fulldeps/extern-diff-internal-name/lib.rs → ...run-make/extern-diff-internal-name/lib.rs
diff --git a/...ulldeps/extern-diff-internal-name/test.rs → ...un-make/extern-diff-internal-name/test.rs b/...ulldeps/extern-diff-internal-name/test.rs → ...un-make/extern-diff-internal-name/test.rs
diff --git a/...lldeps/extern-flag-disambiguates/Makefile → ...n-make/extern-flag-disambiguates/Makefile b/...lldeps/extern-flag-disambiguates/Makefile → ...n-make/extern-flag-disambiguates/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # Attempt to build this dependency tree:

diff --git a/...e-fulldeps/extern-flag-disambiguates/a.rs → ...s/run-make/extern-flag-disambiguates/a.rs b/...e-fulldeps/extern-flag-disambiguates/a.rs → ...s/run-make/extern-flag-disambiguates/a.rs
diff --git a/...e-fulldeps/extern-flag-disambiguates/b.rs → ...s/run-make/extern-flag-disambiguates/b.rs b/...e-fulldeps/extern-flag-disambiguates/b.rs → ...s/run-make/extern-flag-disambiguates/b.rs
diff --git a/...e-fulldeps/extern-flag-disambiguates/c.rs → ...s/run-make/extern-flag-disambiguates/c.rs b/...e-fulldeps/extern-flag-disambiguates/c.rs → ...s/run-make/extern-flag-disambiguates/c.rs
diff --git a/...e-fulldeps/extern-flag-disambiguates/d.rs → ...s/run-make/extern-flag-disambiguates/d.rs b/...e-fulldeps/extern-flag-disambiguates/d.rs → ...s/run-make/extern-flag-disambiguates/d.rs
diff --git a/...un-make-fulldeps/extern-flag-fun/Makefile → tests/run-make/extern-flag-fun/Makefile b/...un-make-fulldeps/extern-flag-fun/Makefile → tests/run-make/extern-flag-fun/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...-make-fulldeps/extern-flag-fun/bar-alt.rs → tests/run-make/extern-flag-fun/bar-alt.rs b/...-make-fulldeps/extern-flag-fun/bar-alt.rs → tests/run-make/extern-flag-fun/bar-alt.rs
diff --git a/.../run-make-fulldeps/extern-flag-fun/bar.rs → tests/run-make/extern-flag-fun/bar.rs b/.../run-make-fulldeps/extern-flag-fun/bar.rs → tests/run-make/extern-flag-fun/bar.rs
diff --git a/.../run-make-fulldeps/extern-flag-fun/foo.rs → tests/run-make/extern-flag-fun/foo.rs b/.../run-make-fulldeps/extern-flag-fun/foo.rs → tests/run-make/extern-flag-fun/foo.rs
diff --git a/...ulldeps/extern-flag-fun/gated_unstable.rs → ...un-make/extern-flag-fun/gated_unstable.rs b/...ulldeps/extern-flag-fun/gated_unstable.rs → ...un-make/extern-flag-fun/gated_unstable.rs
diff --git a/...un-make-fulldeps/extern-flag-fun/rustc.rs → tests/run-make/extern-flag-fun/rustc.rs b/...un-make-fulldeps/extern-flag-fun/rustc.rs → tests/run-make/extern-flag-fun/rustc.rs
diff --git a/...ke-fulldeps/extern-flag-pathless/Makefile → tests/run-make/extern-flag-pathless/Makefile b/...ke-fulldeps/extern-flag-pathless/Makefile → 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/...ldeps/extern-flag-pathless/bar-dynamic.rs → ...-make/extern-flag-pathless/bar-dynamic.rs b/...ldeps/extern-flag-pathless/bar-dynamic.rs → ...-make/extern-flag-pathless/bar-dynamic.rs
diff --git a/...lldeps/extern-flag-pathless/bar-static.rs → ...n-make/extern-flag-pathless/bar-static.rs b/...lldeps/extern-flag-pathless/bar-static.rs → ...n-make/extern-flag-pathless/bar-static.rs
diff --git a/...make-fulldeps/extern-flag-pathless/foo.rs → tests/run-make/extern-flag-pathless/foo.rs b/...make-fulldeps/extern-flag-pathless/foo.rs → tests/run-make/extern-flag-pathless/foo.rs
diff --git a/...ps/extern-flag-rename-transitive/Makefile → ...ke/extern-flag-rename-transitive/Makefile b/...ps/extern-flag-rename-transitive/Makefile → ...ke/extern-flag-rename-transitive/Makefile
diff --git a/...deps/extern-flag-rename-transitive/bar.rs → ...make/extern-flag-rename-transitive/bar.rs b/...deps/extern-flag-rename-transitive/bar.rs → ...make/extern-flag-rename-transitive/bar.rs
diff --git a/...deps/extern-flag-rename-transitive/baz.rs → ...make/extern-flag-rename-transitive/baz.rs b/...deps/extern-flag-rename-transitive/baz.rs → ...make/extern-flag-rename-transitive/baz.rs
diff --git a/...deps/extern-flag-rename-transitive/foo.rs → ...make/extern-flag-rename-transitive/foo.rs b/...deps/extern-flag-rename-transitive/foo.rs → ...make/extern-flag-rename-transitive/foo.rs
diff --git a/...-make-fulldeps/extern-fn-generic/Makefile → tests/run-make/extern-fn-generic/Makefile b/...-make-fulldeps/extern-fn-generic/Makefile → 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/...un-make-fulldeps/extern-fn-generic/test.c → tests/run-make/extern-fn-generic/test.c b/...un-make-fulldeps/extern-fn-generic/test.c → tests/run-make/extern-fn-generic/test.c
diff --git a/...n-make-fulldeps/extern-fn-generic/test.rs → tests/run-make/extern-fn-generic/test.rs b/...n-make-fulldeps/extern-fn-generic/test.rs → tests/run-make/extern-fn-generic/test.rs
diff --git a/...e-fulldeps/extern-fn-generic/testcrate.rs → ...s/run-make/extern-fn-generic/testcrate.rs b/...e-fulldeps/extern-fn-generic/testcrate.rs → ...s/run-make/extern-fn-generic/testcrate.rs
diff --git a/...n-make-fulldeps/extern-fn-mangle/Makefile → tests/run-make/extern-fn-mangle/Makefile b/...n-make-fulldeps/extern-fn-mangle/Makefile → 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/...run-make-fulldeps/extern-fn-mangle/test.c → tests/run-make/extern-fn-mangle/test.c b/...run-make-fulldeps/extern-fn-mangle/test.c → tests/run-make/extern-fn-mangle/test.c
diff --git a/...un-make-fulldeps/extern-fn-mangle/test.rs → tests/run-make/extern-fn-mangle/test.rs b/...un-make-fulldeps/extern-fn-mangle/test.rs → tests/run-make/extern-fn-mangle/test.rs
diff --git a/...ake-fulldeps/extern-fn-reachable/Makefile → tests/run-make/extern-fn-reachable/Makefile b/...ake-fulldeps/extern-fn-reachable/Makefile → tests/run-make/extern-fn-reachable/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 # ignore-windows-msvc

diff --git a/...ake-fulldeps/extern-fn-reachable/dylib.rs → tests/run-make/extern-fn-reachable/dylib.rs b/...ake-fulldeps/extern-fn-reachable/dylib.rs → tests/run-make/extern-fn-reachable/dylib.rs
diff --git a/...eps/extern-fn-struct-passing-abi/Makefile → ...ake/extern-fn-struct-passing-abi/Makefile b/...eps/extern-fn-struct-passing-abi/Makefile → ...ake/extern-fn-struct-passing-abi/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,test)

diff --git a/...ldeps/extern-fn-struct-passing-abi/test.c → ...-make/extern-fn-struct-passing-abi/test.c b/...ldeps/extern-fn-struct-passing-abi/test.c → ...-make/extern-fn-struct-passing-abi/test.c
diff --git a/...deps/extern-fn-struct-passing-abi/test.rs → ...make/extern-fn-struct-passing-abi/test.rs b/...deps/extern-fn-struct-passing-abi/test.rs → ...make/extern-fn-struct-passing-abi/test.rs
diff --git a/...deps/extern-fn-with-extern-types/Makefile → ...make/extern-fn-with-extern-types/Makefile b/...deps/extern-fn-with-extern-types/Makefile → ...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/...ldeps/extern-fn-with-extern-types/ctest.c → ...-make/extern-fn-with-extern-types/ctest.c b/...ldeps/extern-fn-with-extern-types/ctest.c → ...-make/extern-fn-with-extern-types/ctest.c
diff --git a/...ldeps/extern-fn-with-extern-types/test.rs → ...-make/extern-fn-with-extern-types/test.rs b/...ldeps/extern-fn-with-extern-types/test.rs → ...-make/extern-fn-with-extern-types/test.rs
diff --git a/...eps/extern-fn-with-packed-struct/Makefile → ...ake/extern-fn-with-packed-struct/Makefile b/...eps/extern-fn-with-packed-struct/Makefile → ...ake/extern-fn-with-packed-struct/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: $(call NATIVE_STATICLIB,test)

diff --git a/...ldeps/extern-fn-with-packed-struct/test.c → ...-make/extern-fn-with-packed-struct/test.c b/...ldeps/extern-fn-with-packed-struct/test.c → ...-make/extern-fn-with-packed-struct/test.c
diff --git a/...deps/extern-fn-with-packed-struct/test.rs → ...make/extern-fn-with-packed-struct/test.rs b/...deps/extern-fn-with-packed-struct/test.rs → ...make/extern-fn-with-packed-struct/test.rs
diff --git a/...ke-fulldeps/extern-fn-with-union/Makefile → tests/run-make/extern-fn-with-union/Makefile b/...ke-fulldeps/extern-fn-with-union/Makefile → 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/...ake-fulldeps/extern-fn-with-union/ctest.c → tests/run-make/extern-fn-with-union/ctest.c b/...ake-fulldeps/extern-fn-with-union/ctest.c → tests/run-make/extern-fn-with-union/ctest.c
diff --git a/...ake-fulldeps/extern-fn-with-union/test.rs → tests/run-make/extern-fn-with-union/test.rs b/...ake-fulldeps/extern-fn-with-union/test.rs → tests/run-make/extern-fn-with-union/test.rs
diff --git a/...ulldeps/extern-fn-with-union/testcrate.rs → ...un-make/extern-fn-with-union/testcrate.rs b/...ulldeps/extern-fn-with-union/testcrate.rs → ...un-make/extern-fn-with-union/testcrate.rs
diff --git a/...-fulldeps/extern-multiple-copies/Makefile → .../run-make/extern-multiple-copies/Makefile b/...-fulldeps/extern-multiple-copies/Makefile → .../run-make/extern-multiple-copies/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...ke-fulldeps/extern-multiple-copies/bar.rs → tests/run-make/extern-multiple-copies/bar.rs b/...ke-fulldeps/extern-multiple-copies/bar.rs → tests/run-make/extern-multiple-copies/bar.rs
diff --git a/...e-fulldeps/extern-multiple-copies/foo1.rs → ...s/run-make/extern-multiple-copies/foo1.rs b/...e-fulldeps/extern-multiple-copies/foo1.rs → ...s/run-make/extern-multiple-copies/foo1.rs
diff --git a/...e-fulldeps/extern-multiple-copies/foo2.rs → ...s/run-make/extern-multiple-copies/foo2.rs b/...e-fulldeps/extern-multiple-copies/foo2.rs → ...s/run-make/extern-multiple-copies/foo2.rs
diff --git a/...fulldeps/extern-multiple-copies2/Makefile → ...run-make/extern-multiple-copies2/Makefile b/...fulldeps/extern-multiple-copies2/Makefile → ...run-make/extern-multiple-copies2/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...e-fulldeps/extern-multiple-copies2/bar.rs → ...s/run-make/extern-multiple-copies2/bar.rs b/...e-fulldeps/extern-multiple-copies2/bar.rs → ...s/run-make/extern-multiple-copies2/bar.rs
diff --git a/...-fulldeps/extern-multiple-copies2/foo1.rs → .../run-make/extern-multiple-copies2/foo1.rs b/...-fulldeps/extern-multiple-copies2/foo1.rs → .../run-make/extern-multiple-copies2/foo1.rs
diff --git a/...-fulldeps/extern-multiple-copies2/foo2.rs → .../run-make/extern-multiple-copies2/foo2.rs b/...-fulldeps/extern-multiple-copies2/foo2.rs → .../run-make/extern-multiple-copies2/foo2.rs
diff --git a/...ps/extern-overrides-distribution/Makefile → ...ke/extern-overrides-distribution/Makefile b/...ps/extern-overrides-distribution/Makefile → ...ke/extern-overrides-distribution/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...eps/extern-overrides-distribution/libc.rs → ...ake/extern-overrides-distribution/libc.rs b/...eps/extern-overrides-distribution/libc.rs → ...ake/extern-overrides-distribution/libc.rs
diff --git a/...eps/extern-overrides-distribution/main.rs → ...ake/extern-overrides-distribution/main.rs b/...eps/extern-overrides-distribution/main.rs → ...ake/extern-overrides-distribution/main.rs
diff --git a/...extra-filename-with-temp-outputs/Makefile → ...extra-filename-with-temp-outputs/Makefile b/...extra-filename-with-temp-outputs/Makefile → ...extra-filename-with-temp-outputs/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all:

diff --git a/...s/extra-filename-with-temp-outputs/foo.rs → ...e/extra-filename-with-temp-outputs/foo.rs b/...s/extra-filename-with-temp-outputs/foo.rs → ...e/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
@@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
 
 # ignore-windows
 

diff --git a/...e-fulldeps/foreign-double-unwind/Makefile → ...s/run-make/foreign-double-unwind/Makefile b/...e-fulldeps/foreign-double-unwind/Makefile → ...s/run-make/foreign-double-unwind/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: foo

diff --git a/...ke-fulldeps/foreign-double-unwind/foo.cpp → tests/run-make/foreign-double-unwind/foo.cpp b/...ke-fulldeps/foreign-double-unwind/foo.cpp → tests/run-make/foreign-double-unwind/foo.cpp
diff --git a/...ake-fulldeps/foreign-double-unwind/foo.rs → tests/run-make/foreign-double-unwind/foo.rs b/...ake-fulldeps/foreign-double-unwind/foo.rs → tests/run-make/foreign-double-unwind/foo.rs
diff --git a/...make-fulldeps/foreign-exceptions/Makefile → tests/run-make/foreign-exceptions/Makefile b/...make-fulldeps/foreign-exceptions/Makefile → tests/run-make/foreign-exceptions/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk
 
 all: foo

diff --git a/...-make-fulldeps/foreign-exceptions/foo.cpp → tests/run-make/foreign-exceptions/foo.cpp b/...-make-fulldeps/foreign-exceptions/foo.cpp → tests/run-make/foreign-exceptions/foo.cpp
diff --git a/...n-make-fulldeps/foreign-exceptions/foo.rs → tests/run-make/foreign-exceptions/foo.rs b/...n-make-fulldeps/foreign-exceptions/foo.rs → tests/run-make/foreign-exceptions/foo.rs
diff --git a/...fulldeps/foreign-rust-exceptions/Makefile → ...run-make/foreign-rust-exceptions/Makefile b/...fulldeps/foreign-rust-exceptions/Makefile → ...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/...e-fulldeps/foreign-rust-exceptions/bar.rs → ...s/run-make/foreign-rust-exceptions/bar.rs b/...e-fulldeps/foreign-rust-exceptions/bar.rs → ...s/run-make/foreign-rust-exceptions/bar.rs
diff --git a/...e-fulldeps/foreign-rust-exceptions/foo.rs → ...s/run-make/foreign-rust-exceptions/foo.rs b/...e-fulldeps/foreign-rust-exceptions/foo.rs → ...s/run-make/foreign-rust-exceptions/foo.rs
diff --git a/tests/run-make-fulldeps/fpic/Makefile → tests/run-make/fpic/Makefile b/tests/run-make-fulldeps/fpic/Makefile → 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 → tests/run-make/fpic/hello.rs b/tests/run-make-fulldeps/fpic/hello.rs → tests/run-make/fpic/hello.rs
diff --git a/...ke-fulldeps/glibc-staticlib-args/Makefile → tests/run-make/glibc-staticlib-args/Makefile b/...ke-fulldeps/glibc-staticlib-args/Makefile → tests/run-make/glibc-staticlib-args/Makefile
@@ -1,3 +1,4 @@
+# ignore-cross-compile
 # only-gnu
 # only-linux
 

diff --git a/...-fulldeps/glibc-staticlib-args/library.rs → .../run-make/glibc-staticlib-args/library.rs b/...-fulldeps/glibc-staticlib-args/library.rs → .../run-make/glibc-staticlib-args/library.rs
diff --git a/...e-fulldeps/glibc-staticlib-args/program.c → ...s/run-make/glibc-staticlib-args/program.c b/...e-fulldeps/glibc-staticlib-args/program.c → ...s/run-make/glibc-staticlib-args/program.c
diff --git a/tests/run-make-fulldeps/hir-tree/Makefile → tests/run-make/hir-tree/Makefile b/tests/run-make-fulldeps/hir-tree/Makefile → tests/run-make/hir-tree/Makefile
diff --git a/tests/run-make-fulldeps/hir-tree/input.rs → tests/run-make/hir-tree/input.rs b/tests/run-make-fulldeps/hir-tree/input.rs → tests/run-make/hir-tree/input.rs
diff --git a/...make-fulldeps/include_bytes_deps/Makefile → tests/run-make/include_bytes_deps/Makefile b/...make-fulldeps/include_bytes_deps/Makefile → tests/run-make/include_bytes_deps/Makefile
diff --git a/...ake-fulldeps/include_bytes_deps/input.bin → tests/run-make/include_bytes_deps/input.bin b/...ake-fulldeps/include_bytes_deps/input.bin → tests/run-make/include_bytes_deps/input.bin
diff --git a/...make-fulldeps/include_bytes_deps/input.md → tests/run-make/include_bytes_deps/input.md b/...make-fulldeps/include_bytes_deps/input.md → tests/run-make/include_bytes_deps/input.md
diff --git a/...ake-fulldeps/include_bytes_deps/input.txt → tests/run-make/include_bytes_deps/input.txt b/...ake-fulldeps/include_bytes_deps/input.txt → tests/run-make/include_bytes_deps/input.txt
diff --git a/...-make-fulldeps/include_bytes_deps/main.rs → tests/run-make/include_bytes_deps/main.rs b/...-make-fulldeps/include_bytes_deps/main.rs → tests/run-make/include_bytes_deps/main.rs
diff --git a/...deps/incr-add-rust-src-component/Makefile → ...make/incr-add-rust-src-component/Makefile b/...deps/incr-add-rust-src-component/Makefile → ...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/...ldeps/incr-add-rust-src-component/main.rs → ...-make/incr-add-rust-src-component/main.rs b/...ldeps/incr-add-rust-src-component/main.rs → ...-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
@@ -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
@@ -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
@@ -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/...-fulldeps/inline-always-many-cgu/Makefile → .../run-make/inline-always-many-cgu/Makefile b/...-fulldeps/inline-always-many-cgu/Makefile → .../run-make/inline-always-many-cgu/Makefile
diff --git a/...ke-fulldeps/inline-always-many-cgu/foo.rs → tests/run-make/inline-always-many-cgu/foo.rs b/...ke-fulldeps/inline-always-many-cgu/foo.rs → tests/run-make/inline-always-many-cgu/foo.rs
diff --git a/...ldeps/interdependent-c-libraries/Makefile → ...-make/interdependent-c-libraries/Makefile b/...ldeps/interdependent-c-libraries/Makefile → ...-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/...fulldeps/interdependent-c-libraries/bar.c → ...run-make/interdependent-c-libraries/bar.c b/...fulldeps/interdependent-c-libraries/bar.c → ...run-make/interdependent-c-libraries/bar.c
diff --git a/...ulldeps/interdependent-c-libraries/bar.rs → ...un-make/interdependent-c-libraries/bar.rs b/...ulldeps/interdependent-c-libraries/bar.rs → ...un-make/interdependent-c-libraries/bar.rs
diff --git a/...fulldeps/interdependent-c-libraries/foo.c → ...run-make/interdependent-c-libraries/foo.c b/...fulldeps/interdependent-c-libraries/foo.c → ...run-make/interdependent-c-libraries/foo.c
diff --git a/...ulldeps/interdependent-c-libraries/foo.rs → ...un-make/interdependent-c-libraries/foo.rs b/...ulldeps/interdependent-c-libraries/foo.rs → ...un-make/interdependent-c-libraries/foo.rs
diff --git a/...lldeps/interdependent-c-libraries/main.rs → ...n-make/interdependent-c-libraries/main.rs b/...lldeps/interdependent-c-libraries/main.rs → ...n-make/interdependent-c-libraries/main.rs
diff --git a/...e-fulldeps/intrinsic-unreachable/Makefile → ...s/run-make/intrinsic-unreachable/Makefile b/...e-fulldeps/intrinsic-unreachable/Makefile → ...s/run-make/intrinsic-unreachable/Makefile
diff --git a/...ulldeps/intrinsic-unreachable/exit-ret.rs → ...un-make/intrinsic-unreachable/exit-ret.rs b/...ulldeps/intrinsic-unreachable/exit-ret.rs → ...un-make/intrinsic-unreachable/exit-ret.rs
diff --git a/...intrinsic-unreachable/exit-unreachable.rs → ...intrinsic-unreachable/exit-unreachable.rs b/...intrinsic-unreachable/exit-unreachable.rs → ...intrinsic-unreachable/exit-unreachable.rs
diff --git a/...un-make-fulldeps/invalid-library/Makefile → tests/run-make/invalid-library/Makefile b/...un-make-fulldeps/invalid-library/Makefile → tests/run-make/invalid-library/Makefile
diff --git a/.../run-make-fulldeps/invalid-library/foo.rs → tests/run-make/invalid-library/foo.rs b/.../run-make-fulldeps/invalid-library/foo.rs → tests/run-make/invalid-library/foo.rs
diff --git 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/...-make-fulldeps/invalid-staticlib/Makefile → tests/run-make/invalid-staticlib/Makefile b/...-make-fulldeps/invalid-staticlib/Makefile → 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
@@ -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 → tests/run-make/issue-11908/Makefile b/tests/run-make-fulldeps/issue-11908/Makefile → 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 → tests/run-make/issue-11908/bar.rs b/tests/run-make-fulldeps/issue-11908/bar.rs → tests/run-make/issue-11908/bar.rs
diff --git a/tests/run-make-fulldeps/issue-11908/foo.rs → tests/run-make/issue-11908/foo.rs b/tests/run-make-fulldeps/issue-11908/foo.rs → tests/run-make/issue-11908/foo.rs
diff --git a/tests/run-make-fulldeps/issue-14500/Makefile → tests/run-make/issue-14500/Makefile b/tests/run-make-fulldeps/issue-14500/Makefile → 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 → tests/run-make/issue-14500/bar.rs b/tests/run-make-fulldeps/issue-14500/bar.rs → tests/run-make/issue-14500/bar.rs
diff --git a/tests/run-make-fulldeps/issue-14500/foo.c → tests/run-make/issue-14500/foo.c b/tests/run-make-fulldeps/issue-14500/foo.c → tests/run-make/issue-14500/foo.c
diff --git a/tests/run-make-fulldeps/issue-14500/foo.rs → tests/run-make/issue-14500/foo.rs b/tests/run-make-fulldeps/issue-14500/foo.rs → tests/run-make/issue-14500/foo.rs
diff --git a/tests/run-make-fulldeps/issue-14698/Makefile → tests/run-make/issue-14698/Makefile b/tests/run-make-fulldeps/issue-14698/Makefile → tests/run-make/issue-14698/Makefile
diff --git a/tests/run-make-fulldeps/issue-14698/foo.rs → tests/run-make/issue-14698/foo.rs b/tests/run-make-fulldeps/issue-14698/foo.rs → tests/run-make/issue-14698/foo.rs
diff --git a/tests/run-make-fulldeps/issue-15460/Makefile → tests/run-make/issue-15460/Makefile b/tests/run-make-fulldeps/issue-15460/Makefile → 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 → tests/run-make/issue-15460/bar.rs b/tests/run-make-fulldeps/issue-15460/bar.rs → tests/run-make/issue-15460/bar.rs
diff --git a/tests/run-make-fulldeps/issue-15460/foo.c → tests/run-make/issue-15460/foo.c b/tests/run-make-fulldeps/issue-15460/foo.c → tests/run-make/issue-15460/foo.c
diff --git a/tests/run-make-fulldeps/issue-15460/foo.rs → tests/run-make/issue-15460/foo.rs b/tests/run-make-fulldeps/issue-15460/foo.rs → tests/run-make/issue-15460/foo.rs
diff --git a/tests/run-make-fulldeps/issue-18943/Makefile → tests/run-make/issue-18943/Makefile b/tests/run-make-fulldeps/issue-18943/Makefile → tests/run-make/issue-18943/Makefile
diff --git a/tests/run-make-fulldeps/issue-18943/foo.rs → tests/run-make/issue-18943/foo.rs b/tests/run-make-fulldeps/issue-18943/foo.rs → tests/run-make/issue-18943/foo.rs