Auto merge of #109770 - jyn514:run-make-fulldeps, r=Mark-Simulacrum

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 https://github.com/rust-lang/rust/pull/83775 Fixes https://github.com/rust-lang/rust/issues/66085. Fixes https://github.com/rust-lang/rust/issues/83773.
2023-04-03 01:34:05 +00:00 · 2023-04-03 01:34:05 +00:00 · 33289132ec
parent a93bcdc307 c45037b956
commit 33289132ec
774 changed files with 226 additions and 95 deletions
--- 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

--- 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.
--- a/tests/run-make-fulldeps/issue-25581/Makefile
+++ b/tests/run-make-fulldeps/issue-25581/Makefile
@ -1,5 +0,0 @@
-include ../tools.mk
-
-all: $(call NATIVE_STATICLIB,test)
-	$(RUSTC) test.rs
-	$(call RUN,test) || exit 1
--- 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.
--- 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
--- a/tests/run-make-fulldeps/a-b-a-linker-guard/Makefile
+++ b/tests/run-make-fulldeps/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
--- a/tests/run-make-fulldeps/a-b-a-linker-guard/a.rs
+++ b/tests/run-make-fulldeps/a-b-a-linker-guard/a.rs
--- a/tests/run-make-fulldeps/a-b-a-linker-guard/b.rs
+++ b/tests/run-make-fulldeps/a-b-a-linker-guard/b.rs
--- a/tests/run-make-fulldeps/alloc-no-oom-handling/Makefile
+++ b/tests/run-make-fulldeps/alloc-no-oom-handling/Makefile
--- a/tests/run-make-fulldeps/alloc-no-rc/Makefile
+++ b/tests/run-make-fulldeps/alloc-no-rc/Makefile
--- a/tests/run-make-fulldeps/alloc-no-sync/Makefile
+++ b/tests/run-make-fulldeps/alloc-no-sync/Makefile
--- a/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile
+++ b/tests/run-make-fulldeps/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
--- a/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs
+++ b/tests/run-make-fulldeps/allow-non-lint-warnings-cmdline/foo.rs
--- a/tests/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile
+++ b/tests/run-make-fulldeps/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
--- a/tests/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
+++ b/tests/run-make-fulldeps/allow-warnings-cmdline-stability/bar.rs
--- a/tests/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
+++ b/tests/run-make-fulldeps/allow-warnings-cmdline-stability/foo.rs
--- a/tests/run-make-fulldeps/archive-duplicate-names/Makefile
+++ b/tests/run-make-fulldeps/archive-duplicate-names/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

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

 all:
--- a/tests/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
+++ b/tests/run-make-fulldeps/arguments-non-c-like-enum/nonclike.rs
--- a/tests/run-make-fulldeps/arguments-non-c-like-enum/test.c
+++ b/tests/run-make-fulldeps/arguments-non-c-like-enum/test.c
--- a/tests/run-make-fulldeps/atomic-lock-free/Makefile
+++ b/tests/run-make-fulldeps/atomic-lock-free/Makefile
--- a/tests/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs
+++ b/tests/run-make-fulldeps/atomic-lock-free/atomic_lock_free.rs
--- a/tests/run-make-fulldeps/bare-outfile/Makefile
+++ b/tests/run-make-fulldeps/bare-outfile/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

 all:
--- a/tests/run-make-fulldeps/bare-outfile/foo.rs
+++ b/tests/run-make-fulldeps/bare-outfile/foo.rs
--- a/tests/run-make-fulldeps/c-dynamic-dylib/Makefile
+++ b/tests/run-make-fulldeps/c-dynamic-dylib/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

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

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

 all: $(TMPDIR)/$(call BIN,bar)
--- a/tests/run-make-fulldeps/c-link-to-rust-dylib/bar.c
+++ b/tests/run-make-fulldeps/c-link-to-rust-dylib/bar.c
--- a/tests/run-make-fulldeps/c-link-to-rust-dylib/foo.rs
+++ b/tests/run-make-fulldeps/c-link-to-rust-dylib/foo.rs
--- a/tests/run-make-fulldeps/c-link-to-rust-staticlib/Makefile
+++ b/tests/run-make-fulldeps/c-link-to-rust-staticlib/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

 # ignore-freebsd
--- a/tests/run-make-fulldeps/c-link-to-rust-staticlib/bar.c
+++ b/tests/run-make-fulldeps/c-link-to-rust-staticlib/bar.c
--- a/tests/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs
+++ b/tests/run-make-fulldeps/c-link-to-rust-staticlib/foo.rs
--- a/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
+++ b/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

 all:
--- a/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/checkrust.rs
+++ b/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/checkrust.rs
--- a/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/test.c
+++ b/tests/run-make-fulldeps/c-link-to-rust-va-list-fn/test.c
--- a/tests/run-make-fulldeps/c-static-dylib/Makefile
+++ b/tests/run-make-fulldeps/c-static-dylib/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

 all: $(call NATIVE_STATICLIB,cfoo)
--- a/tests/run-make-fulldeps/c-static-dylib/bar.rs
+++ b/tests/run-make-fulldeps/c-static-dylib/bar.rs
--- a/tests/run-make-fulldeps/c-static-dylib/cfoo.c
+++ b/tests/run-make-fulldeps/c-static-dylib/cfoo.c
--- a/tests/run-make-fulldeps/c-static-dylib/foo.rs
+++ b/tests/run-make-fulldeps/c-static-dylib/foo.rs
--- a/tests/run-make-fulldeps/c-static-rlib/Makefile
+++ b/tests/run-make-fulldeps/c-static-rlib/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

 all: $(call NATIVE_STATICLIB,cfoo)
--- a/tests/run-make-fulldeps/c-static-rlib/bar.rs
+++ b/tests/run-make-fulldeps/c-static-rlib/bar.rs
--- a/tests/run-make-fulldeps/c-static-rlib/cfoo.c
+++ b/tests/run-make-fulldeps/c-static-rlib/cfoo.c
--- a/tests/run-make-fulldeps/c-static-rlib/foo.rs
+++ b/tests/run-make-fulldeps/c-static-rlib/foo.rs
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

 all: archive
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/add.c
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/add.c
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/main.rs
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/main.rs
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/panic.rs
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-lib-panic/panic.rs
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

 all: $(call NATIVE_STATICLIB,add)
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-panic/add.c
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-panic/add.c
--- a/tests/run-make-fulldeps/c-unwind-abi-catch-panic/main.rs
+++ b/tests/run-make-fulldeps/c-unwind-abi-catch-panic/main.rs
--- a/tests/run-make-fulldeps/cat-and-grep-sanity-check/Makefile
+++ b/tests/run-make-fulldeps/cat-and-grep-sanity-check/Makefile
--- a/tests/run-make-fulldeps/cdylib-dylib-linkage/Makefile
+++ b/tests/run-make-fulldeps/cdylib-dylib-linkage/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

 TARGET_SYSROOT := $(shell $(RUSTC) --print sysroot)/lib/rustlib/$(TARGET)/lib
--- a/tests/run-make-fulldeps/cdylib-dylib-linkage/bar.rs
+++ b/tests/run-make-fulldeps/cdylib-dylib-linkage/bar.rs
--- a/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.c
+++ b/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.c
--- a/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.rs
+++ b/tests/run-make-fulldeps/cdylib-dylib-linkage/foo.rs
--- a/tests/run-make-fulldeps/cdylib-fewer-symbols/Makefile
+++ b/tests/run-make-fulldeps/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.

--- a/tests/run-make-fulldeps/cdylib-fewer-symbols/foo.rs
+++ b/tests/run-make-fulldeps/cdylib-fewer-symbols/foo.rs
--- a/tests/run-make-fulldeps/cdylib/Makefile
+++ b/tests/run-make-fulldeps/cdylib/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

 all: $(call RUN_BINFILE,foo)
--- a/tests/run-make-fulldeps/cdylib/bar.rs
+++ b/tests/run-make-fulldeps/cdylib/bar.rs
--- a/tests/run-make-fulldeps/cdylib/foo.c
+++ b/tests/run-make-fulldeps/cdylib/foo.c
--- a/tests/run-make-fulldeps/cdylib/foo.rs
+++ b/tests/run-make-fulldeps/cdylib/foo.rs
--- a/tests/run-make-fulldeps/codegen-options-parsing/Makefile
+++ b/tests/run-make-fulldeps/codegen-options-parsing/Makefile
@ -1,3 +1,4 @@
+# ignore-cross-compile
 include ../tools.mk

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

 all:
--- a/tests/run-make-fulldeps/compiler-lookup-paths-2/Makefile
+++ b/tests/run-make-fulldeps/compiler-lookup-paths-2/Makefile
--- a/tests/run-make-fulldeps/compiler-lookup-paths-2/a.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths-2/a.rs
--- a/tests/run-make-fulldeps/compiler-lookup-paths-2/b.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths-2/b.rs
--- a/tests/run-make-fulldeps/compiler-lookup-paths-2/c.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths-2/c.rs
--- a/tests/run-make-fulldeps/compiler-lookup-paths/Makefile
+++ b/tests/run-make-fulldeps/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
--- a/tests/run-make-fulldeps/compiler-lookup-paths/a.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/a.rs
--- a/tests/run-make-fulldeps/compiler-lookup-paths/b.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/b.rs
--- a/tests/run-make-fulldeps/compiler-lookup-paths/c.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/c.rs
--- a/tests/run-make-fulldeps/compiler-lookup-paths/d.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/d.rs
--- a/tests/run-make-fulldeps/compiler-lookup-paths/e.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/e.rs
--- a/tests/run-make-fulldeps/compiler-lookup-paths/e2.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/e2.rs
--- a/tests/run-make-fulldeps/compiler-lookup-paths/f.rs
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/f.rs
--- a/tests/run-make-fulldeps/compiler-lookup-paths/native.c
+++ b/tests/run-make-fulldeps/compiler-lookup-paths/native.c
--- a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile
+++ b/tests/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile
--- a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp
+++ b/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp
--- a/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs
+++ b/tests/run-make-fulldeps/compiler-rt-works-on-mingw/foo.rs
--- 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
--- a/tests/run-make-fulldeps/core-no-fp-fmt-parse/Makefile
+++ b/tests/run-make-fulldeps/core-no-fp-fmt-parse/Makefile
--- 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
--- a/tests/run-make-fulldeps/crate-data-smoke/Makefile
+++ b/tests/run-make-fulldeps/crate-data-smoke/Makefile
--- a/tests/run-make-fulldeps/crate-data-smoke/crate.rs
+++ b/tests/run-make-fulldeps/crate-data-smoke/crate.rs
--- a/tests/run-make-fulldeps/crate-data-smoke/lib.rs
+++ b/tests/run-make-fulldeps/crate-data-smoke/lib.rs
--- a/tests/run-make-fulldeps/crate-data-smoke/rlib.rs
+++ b/tests/run-make-fulldeps/crate-data-smoke/rlib.rs
--- a/tests/run-make-fulldeps/crate-hash-rustc-version/Makefile
+++ b/tests/run-make-fulldeps/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.
--- a/tests/run-make-fulldeps/crate-hash-rustc-version/a.rs
+++ b/tests/run-make-fulldeps/crate-hash-rustc-version/a.rs
--- a/tests/run-make-fulldeps/crate-hash-rustc-version/b.rs
+++ b/tests/run-make-fulldeps/crate-hash-rustc-version/b.rs
--- a/Show More
+++ b/Show More