diff --git a/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile b/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile index 4a9b3d70933..adc9e3d0916 100644 --- a/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile +++ b/src/test/run-make-fulldeps/a-b-a-linker-guard/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test that if we build `b` against a version of `a` that has one set # of types, it will not run with a dylib that has a different set of diff --git a/src/test/run-make-fulldeps/alloc-no-oom-handling/Makefile b/src/test/run-make-fulldeps/alloc-no-oom-handling/Makefile index eb6ad9bd1a7..735d91bd27c 100644 --- a/src/test/run-make-fulldeps/alloc-no-oom-handling/Makefile +++ b/src/test/run-make-fulldeps/alloc-no-oom-handling/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) --edition=2021 -Dwarnings --crate-type=rlib ../../../../library/alloc/src/lib.rs --cfg no_global_oom_handling diff --git a/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile b/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile index c14006cc2e0..60d9c7c3745 100644 --- a/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile +++ b/src/test/run-make-fulldeps/allow-non-lint-warnings-cmdline/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test that -A warnings makes the 'empty trait list for derive' warning go away OUT=$(shell $(RUSTC) foo.rs -A warnings 2>&1 | grep "warning" ) diff --git a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile index 3eecaf93142..1ce8d0ec284 100644 --- a/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile +++ b/src/test/run-make-fulldeps/allow-warnings-cmdline-stability/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test that -A warnings makes the 'empty trait list for derive' warning go away DEP=$(shell $(RUSTC) bar.rs) diff --git a/src/test/run-make-fulldeps/archive-duplicate-names/Makefile b/src/test/run-make-fulldeps/archive-duplicate-names/Makefile index 93711c41d79..bbdcd2a34fe 100644 --- a/src/test/run-make-fulldeps/archive-duplicate-names/Makefile +++ b/src/test/run-make-fulldeps/archive-duplicate-names/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: mkdir $(TMPDIR)/a diff --git a/src/test/run-make-fulldeps/arguments-non-c-like-enum/Makefile b/src/test/run-make-fulldeps/arguments-non-c-like-enum/Makefile index 5b5d620efe6..513311c8289 100644 --- a/src/test/run-make-fulldeps/arguments-non-c-like-enum/Makefile +++ b/src/test/run-make-fulldeps/arguments-non-c-like-enum/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) --crate-type=staticlib nonclike.rs diff --git a/src/test/run-make-fulldeps/atomic-lock-free/Makefile b/src/test/run-make-fulldeps/atomic-lock-free/Makefile index 9e8b4fabf17..37e59624a25 100644 --- a/src/test/run-make-fulldeps/atomic-lock-free/Makefile +++ b/src/test/run-make-fulldeps/atomic-lock-free/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # This tests ensure that atomic types are never lowered into runtime library calls that are not # guaranteed to be lock-free. diff --git a/src/test/run-make-fulldeps/bare-outfile/Makefile b/src/test/run-make-fulldeps/bare-outfile/Makefile index baa4c1c0237..858466e942b 100644 --- a/src/test/run-make-fulldeps/bare-outfile/Makefile +++ b/src/test/run-make-fulldeps/bare-outfile/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: cp foo.rs $(TMPDIR) diff --git a/src/test/run-make-fulldeps/c-dynamic-dylib/Makefile b/src/test/run-make-fulldeps/c-dynamic-dylib/Makefile index c524610bf5c..ac68778922d 100644 --- a/src/test/run-make-fulldeps/c-dynamic-dylib/Makefile +++ b/src/test/run-make-fulldeps/c-dynamic-dylib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-macos # diff --git a/src/test/run-make-fulldeps/c-dynamic-rlib/Makefile b/src/test/run-make-fulldeps/c-dynamic-rlib/Makefile index 91343e73e15..c65d648b929 100644 --- a/src/test/run-make-fulldeps/c-dynamic-rlib/Makefile +++ b/src/test/run-make-fulldeps/c-dynamic-rlib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-macos # diff --git a/src/test/run-make-fulldeps/c-link-to-rust-dylib/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-dylib/Makefile index 98e112a3744..2a371b54541 100644 --- a/src/test/run-make-fulldeps/c-link-to-rust-dylib/Makefile +++ b/src/test/run-make-fulldeps/c-link-to-rust-dylib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(TMPDIR)/$(call BIN,bar) $(call RUN,bar) diff --git a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/Makefile index 687b59ac00e..d38bcef309a 100644 --- a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/Makefile +++ b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-freebsd # FIXME diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile index f124ca2ab61..9ce2a34e677 100644 --- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile +++ b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) checkrust.rs diff --git a/src/test/run-make-fulldeps/c-static-dylib/Makefile b/src/test/run-make-fulldeps/c-static-dylib/Makefile index f88786857cc..5b78005e3ee 100644 --- a/src/test/run-make-fulldeps/c-static-dylib/Makefile +++ b/src/test/run-make-fulldeps/c-static-dylib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,cfoo) $(RUSTC) foo.rs -C prefer-dynamic diff --git a/src/test/run-make-fulldeps/c-static-rlib/Makefile b/src/test/run-make-fulldeps/c-static-rlib/Makefile index be22b2728f0..11a3cf1940c 100644 --- a/src/test/run-make-fulldeps/c-static-rlib/Makefile +++ b/src/test/run-make-fulldeps/c-static-rlib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,cfoo) $(RUSTC) foo.rs diff --git a/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile b/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile index a8515c533af..134f000d453 100644 --- a/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile +++ b/src/test/run-make-fulldeps/c-unwind-abi-catch-lib-panic/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: archive # Compile `main.rs`, which will link into our library, and run it. diff --git a/src/test/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile b/src/test/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile index 9553b7aeeb9..e93ec99da2a 100644 --- a/src/test/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile +++ b/src/test/run-make-fulldeps/c-unwind-abi-catch-panic/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,add) $(RUSTC) main.rs diff --git a/src/test/run-make-fulldeps/cat-and-grep-sanity-check/Makefile b/src/test/run-make-fulldeps/cat-and-grep-sanity-check/Makefile index fead197ce39..82351e22009 100644 --- a/src/test/run-make-fulldeps/cat-and-grep-sanity-check/Makefile +++ b/src/test/run-make-fulldeps/cat-and-grep-sanity-check/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: echo a | $(CGREP) a diff --git a/src/test/run-make-fulldeps/cdylib-fewer-symbols/Makefile b/src/test/run-make-fulldeps/cdylib-fewer-symbols/Makefile index 23491d814d0..324791af8de 100644 --- a/src/test/run-make-fulldeps/cdylib-fewer-symbols/Makefile +++ b/src/test/run-make-fulldeps/cdylib-fewer-symbols/Makefile @@ -1,7 +1,7 @@ # 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. --include ../tools.mk +include ../tools.mk # ignore-windows # FIXME: The __rdl_ and __rust_ symbol still remains, no matter using MSVC or GNU diff --git a/src/test/run-make-fulldeps/codegen-options-parsing/Makefile b/src/test/run-make-fulldeps/codegen-options-parsing/Makefile index f1410b69b3f..b063593c9d9 100644 --- a/src/test/run-make-fulldeps/codegen-options-parsing/Makefile +++ b/src/test/run-make-fulldeps/codegen-options-parsing/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: #Option taking a number diff --git a/src/test/run-make-fulldeps/compile-stdin/Makefile b/src/test/run-make-fulldeps/compile-stdin/Makefile index 1442224cf9a..be15548690f 100644 --- a/src/test/run-make-fulldeps/compile-stdin/Makefile +++ b/src/test/run-make-fulldeps/compile-stdin/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: echo 'fn main(){}' | $(RUSTC) - diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths-2/Makefile b/src/test/run-make-fulldeps/compiler-lookup-paths-2/Makefile index bd7f62d5c2d..d4ff7d8daab 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths-2/Makefile +++ b/src/test/run-make-fulldeps/compiler-lookup-paths-2/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: mkdir -p $(TMPDIR)/a $(TMPDIR)/b diff --git a/src/test/run-make-fulldeps/compiler-lookup-paths/Makefile b/src/test/run-make-fulldeps/compiler-lookup-paths/Makefile index e22b937a087..c16bf7af6c4 100644 --- a/src/test/run-make-fulldeps/compiler-lookup-paths/Makefile +++ b/src/test/run-make-fulldeps/compiler-lookup-paths/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(TMPDIR)/libnative.a mkdir -p $(TMPDIR)/crate diff --git a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile index 0cf5d185521..74917570a01 100644 --- a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile +++ b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # only-windows-gnu diff --git a/src/test/run-make-fulldeps/core-no-fp-fmt-parse/Makefile b/src/test/run-make-fulldeps/core-no-fp-fmt-parse/Makefile index f79e4c3f479..d083aaa6620 100644 --- a/src/test/run-make-fulldeps/core-no-fp-fmt-parse/Makefile +++ b/src/test/run-make-fulldeps/core-no-fp-fmt-parse/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) --edition=2021 --crate-type=rlib ../../../../library/core/src/lib.rs --cfg no_fp_fmt_parse diff --git a/src/test/run-make-fulldeps/crate-data-smoke/Makefile b/src/test/run-make-fulldeps/crate-data-smoke/Makefile index 1afda457411..a453f65ff3e 100644 --- a/src/test/run-make-fulldeps/crate-data-smoke/Makefile +++ b/src/test/run-make-fulldeps/crate-data-smoke/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: [ `$(RUSTC) --print crate-name crate.rs` = "foo" ] diff --git a/src/test/run-make-fulldeps/crate-hash-rustc-version/Makefile b/src/test/run-make-fulldeps/crate-hash-rustc-version/Makefile index 091508cd805..4f25a865ebd 100644 --- a/src/test/run-make-fulldeps/crate-hash-rustc-version/Makefile +++ b/src/test/run-make-fulldeps/crate-hash-rustc-version/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # Ensure that crates compiled with different rustc versions cannot # be dynamically linked. diff --git a/src/test/run-make-fulldeps/crate-name-priority/Makefile b/src/test/run-make-fulldeps/crate-name-priority/Makefile index 17ecb33ab28..08a07c325e3 100644 --- a/src/test/run-make-fulldeps/crate-name-priority/Makefile +++ b/src/test/run-make-fulldeps/crate-name-priority/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs diff --git a/src/test/run-make-fulldeps/cross-lang-lto-clang/Makefile b/src/test/run-make-fulldeps/cross-lang-lto-clang/Makefile index 3ca2a8afad0..acaebf439d6 100644 --- a/src/test/run-make-fulldeps/cross-lang-lto-clang/Makefile +++ b/src/test/run-make-fulldeps/cross-lang-lto-clang/Makefile @@ -3,7 +3,7 @@ # This test makes sure that cross-language inlining actually works by checking # the generated machine code. --include ../tools.mk +include ../tools.mk all: cpp-executable rust-executable diff --git a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile b/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile index f8efeca5614..70085d9bde1 100644 --- a/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile +++ b/src/test/run-make-fulldeps/cross-lang-lto-pgo-smoketest/Makefile @@ -5,7 +5,7 @@ # can be executed without anything crashing. It does not test whether PGO or # xLTO have any specific effect on the generated code. --include ../tools.mk +include ../tools.mk COMMON_FLAGS=-Copt-level=3 -Ccodegen-units=1 diff --git a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile index f70b411d747..6f1caa31a80 100644 --- a/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile +++ b/src/test/run-make-fulldeps/cross-lang-lto-upstream-rlibs/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore windows due to libLLVM being present in PATH and the PATH and library path being the same # (so fixing it is harder). See #57765 for context diff --git a/src/test/run-make-fulldeps/cross-lang-lto/Makefile b/src/test/run-make-fulldeps/cross-lang-lto/Makefile index b4394cb5b40..92058f952a9 100644 --- a/src/test/run-make-fulldeps/cross-lang-lto/Makefile +++ b/src/test/run-make-fulldeps/cross-lang-lto/Makefile @@ -1,5 +1,5 @@ --include ../tools.mk +include ../tools.mk # ignore windows due to libLLVM being present in PATH and the PATH and library path being the same # (so fixing it is harder). See #57765 for context diff --git a/src/test/run-make-fulldeps/debug-assertions/Makefile b/src/test/run-make-fulldeps/debug-assertions/Makefile index 76ada90f1e2..73beb4b03ae 100644 --- a/src/test/run-make-fulldeps/debug-assertions/Makefile +++ b/src/test/run-make-fulldeps/debug-assertions/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) debug.rs -C debug-assertions=no diff --git a/src/test/run-make-fulldeps/dep-info-doesnt-run-much/Makefile b/src/test/run-make-fulldeps/dep-info-doesnt-run-much/Makefile index 2fd84639f21..b4dc44ad2be 100644 --- a/src/test/run-make-fulldeps/dep-info-doesnt-run-much/Makefile +++ b/src/test/run-make-fulldeps/dep-info-doesnt-run-much/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs --emit dep-info diff --git a/src/test/run-make-fulldeps/dep-info-spaces/Makefile b/src/test/run-make-fulldeps/dep-info-spaces/Makefile index 339a751ff96..0cfe513e490 100644 --- a/src/test/run-make-fulldeps/dep-info-spaces/Makefile +++ b/src/test/run-make-fulldeps/dep-info-spaces/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows # ignore-freebsd diff --git a/src/test/run-make-fulldeps/dep-info/Makefile b/src/test/run-make-fulldeps/dep-info/Makefile index afb9db177cf..c76f43a8eed 100644 --- a/src/test/run-make-fulldeps/dep-info/Makefile +++ b/src/test/run-make-fulldeps/dep-info/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows # ignore-freebsd diff --git a/src/test/run-make-fulldeps/dylib-chain/Makefile b/src/test/run-make-fulldeps/dylib-chain/Makefile index a33177197b1..1139822f4ea 100644 --- a/src/test/run-make-fulldeps/dylib-chain/Makefile +++ b/src/test/run-make-fulldeps/dylib-chain/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) m1.rs -C prefer-dynamic diff --git a/src/test/run-make-fulldeps/emit-stack-sizes/Makefile b/src/test/run-make-fulldeps/emit-stack-sizes/Makefile index d2702894842..f636ebd28f2 100644 --- a/src/test/run-make-fulldeps/emit-stack-sizes/Makefile +++ b/src/test/run-make-fulldeps/emit-stack-sizes/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows # ignore-macos diff --git a/src/test/run-make-fulldeps/emit/Makefile b/src/test/run-make-fulldeps/emit/Makefile index e0b57107e5b..78e68bd6111 100644 --- a/src/test/run-make-fulldeps/emit/Makefile +++ b/src/test/run-make-fulldeps/emit/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) -Copt-level=0 --emit=llvm-bc,llvm-ir,asm,obj,link test-24876.rs diff --git a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile index fef12c4da67..0eae41d720c 100644 --- a/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile +++ b/src/test/run-make-fulldeps/error-found-staticlib-instead-crate/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs --crate-type staticlib diff --git a/src/test/run-make-fulldeps/error-writing-dependencies/Makefile b/src/test/run-make-fulldeps/error-writing-dependencies/Makefile index cbc96901a38..a5d30a647f8 100644 --- a/src/test/run-make-fulldeps/error-writing-dependencies/Makefile +++ b/src/test/run-make-fulldeps/error-writing-dependencies/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: # Let's get a nice error message diff --git a/src/test/run-make-fulldeps/exit-code/Makefile b/src/test/run-make-fulldeps/exit-code/Makefile index 007f19852a6..3ffaafe9065 100644 --- a/src/test/run-make-fulldeps/exit-code/Makefile +++ b/src/test/run-make-fulldeps/exit-code/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) success.rs; [ $$? -eq 0 ] diff --git a/src/test/run-make-fulldeps/extern-diff-internal-name/Makefile b/src/test/run-make-fulldeps/extern-diff-internal-name/Makefile index b84e930757b..54596c2f029 100644 --- a/src/test/run-make-fulldeps/extern-diff-internal-name/Makefile +++ b/src/test/run-make-fulldeps/extern-diff-internal-name/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) lib.rs diff --git a/src/test/run-make-fulldeps/extern-flag-disambiguates/Makefile b/src/test/run-make-fulldeps/extern-flag-disambiguates/Makefile index 81930e969a9..a8f142a6402 100644 --- a/src/test/run-make-fulldeps/extern-flag-disambiguates/Makefile +++ b/src/test/run-make-fulldeps/extern-flag-disambiguates/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Attempt to build this dependency tree: # diff --git a/src/test/run-make-fulldeps/extern-flag-fun/Makefile b/src/test/run-make-fulldeps/extern-flag-fun/Makefile index 38d1d5bb848..a0b7c15edb9 100644 --- a/src/test/run-make-fulldeps/extern-flag-fun/Makefile +++ b/src/test/run-make-fulldeps/extern-flag-fun/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) bar.rs --crate-type=rlib diff --git a/src/test/run-make-fulldeps/extern-flag-pathless/Makefile b/src/test/run-make-fulldeps/extern-flag-pathless/Makefile index 4849fc62f4a..0f23815b650 100644 --- a/src/test/run-make-fulldeps/extern-flag-pathless/Makefile +++ b/src/test/run-make-fulldeps/extern-flag-pathless/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test mixing pathless --extern with paths. diff --git a/src/test/run-make-fulldeps/extern-flag-rename-transitive/Makefile b/src/test/run-make-fulldeps/extern-flag-rename-transitive/Makefile index 4354209a722..d16a8e20868 100644 --- a/src/test/run-make-fulldeps/extern-flag-rename-transitive/Makefile +++ b/src/test/run-make-fulldeps/extern-flag-rename-transitive/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs diff --git a/src/test/run-make-fulldeps/extern-fn-generic/Makefile b/src/test/run-make-fulldeps/extern-fn-generic/Makefile index cf897dba1f2..71746fb10cb 100644 --- a/src/test/run-make-fulldeps/extern-fn-generic/Makefile +++ b/src/test/run-make-fulldeps/extern-fn-generic/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,test) $(RUSTC) testcrate.rs diff --git a/src/test/run-make-fulldeps/extern-fn-mangle/Makefile b/src/test/run-make-fulldeps/extern-fn-mangle/Makefile index 042048ec25f..4f5d026f213 100644 --- a/src/test/run-make-fulldeps/extern-fn-mangle/Makefile +++ b/src/test/run-make-fulldeps/extern-fn-mangle/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,test) $(RUSTC) test.rs diff --git a/src/test/run-make-fulldeps/extern-fn-reachable/Makefile b/src/test/run-make-fulldeps/extern-fn-reachable/Makefile index 9231a2b3574..05bdb8d65b7 100644 --- a/src/test/run-make-fulldeps/extern-fn-reachable/Makefile +++ b/src/test/run-make-fulldeps/extern-fn-reachable/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows-msvc diff --git a/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile index 042048ec25f..4f5d026f213 100644 --- a/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile +++ b/src/test/run-make-fulldeps/extern-fn-struct-passing-abi/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,test) $(RUSTC) test.rs diff --git a/src/test/run-make-fulldeps/extern-fn-with-extern-types/Makefile b/src/test/run-make-fulldeps/extern-fn-with-extern-types/Makefile index 8977e14c3ad..1fa708950d4 100644 --- a/src/test/run-make-fulldeps/extern-fn-with-extern-types/Makefile +++ b/src/test/run-make-fulldeps/extern-fn-with-extern-types/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,ctest) $(RUSTC) test.rs diff --git a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/Makefile b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/Makefile index 042048ec25f..4f5d026f213 100644 --- a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/Makefile +++ b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,test) $(RUSTC) test.rs diff --git a/src/test/run-make-fulldeps/extern-fn-with-union/Makefile b/src/test/run-make-fulldeps/extern-fn-with-union/Makefile index 71a5407e882..40bae923e30 100644 --- a/src/test/run-make-fulldeps/extern-fn-with-union/Makefile +++ b/src/test/run-make-fulldeps/extern-fn-with-union/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,ctest) $(RUSTC) testcrate.rs diff --git a/src/test/run-make-fulldeps/extern-multiple-copies/Makefile b/src/test/run-make-fulldeps/extern-multiple-copies/Makefile index 1631aa806af..00668a6bc88 100644 --- a/src/test/run-make-fulldeps/extern-multiple-copies/Makefile +++ b/src/test/run-make-fulldeps/extern-multiple-copies/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo1.rs diff --git a/src/test/run-make-fulldeps/extern-multiple-copies2/Makefile b/src/test/run-make-fulldeps/extern-multiple-copies2/Makefile index 567d7e78a57..84de2ebf34d 100644 --- a/src/test/run-make-fulldeps/extern-multiple-copies2/Makefile +++ b/src/test/run-make-fulldeps/extern-multiple-copies2/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo1.rs diff --git a/src/test/run-make-fulldeps/extern-overrides-distribution/Makefile b/src/test/run-make-fulldeps/extern-overrides-distribution/Makefile index 7d063a4c83c..c57b062cd5d 100644 --- a/src/test/run-make-fulldeps/extern-overrides-distribution/Makefile +++ b/src/test/run-make-fulldeps/extern-overrides-distribution/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) libc.rs -Cmetadata=foo diff --git a/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile b/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile index e46390a9d0c..470448cf50c 100644 --- a/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile +++ b/src/test/run-make-fulldeps/extra-filename-with-temp-outputs/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) -C extra-filename=bar foo.rs -C save-temps diff --git a/src/test/run-make-fulldeps/foreign-double-unwind/Makefile b/src/test/run-make-fulldeps/foreign-double-unwind/Makefile index 27cf4d19ce0..ea2fe9ff881 100644 --- a/src/test/run-make-fulldeps/foreign-double-unwind/Makefile +++ b/src/test/run-make-fulldeps/foreign-double-unwind/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: foo $(call RUN,foo) | $(CGREP) -v unreachable diff --git a/src/test/run-make-fulldeps/foreign-exceptions/Makefile b/src/test/run-make-fulldeps/foreign-exceptions/Makefile index 7eba52f3c24..38fe2773df2 100644 --- a/src/test/run-make-fulldeps/foreign-exceptions/Makefile +++ b/src/test/run-make-fulldeps/foreign-exceptions/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: foo $(call RUN,foo) diff --git a/src/test/run-make-fulldeps/fpic/Makefile b/src/test/run-make-fulldeps/fpic/Makefile index a3d0190eed6..5986de3666f 100644 --- a/src/test/run-make-fulldeps/fpic/Makefile +++ b/src/test/run-make-fulldeps/fpic/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows # ignore-macos diff --git a/src/test/run-make-fulldeps/glibc-staticlib-args/Makefile b/src/test/run-make-fulldeps/glibc-staticlib-args/Makefile index ad841ec6101..39e64bacf58 100644 --- a/src/test/run-make-fulldeps/glibc-staticlib-args/Makefile +++ b/src/test/run-make-fulldeps/glibc-staticlib-args/Makefile @@ -1,7 +1,7 @@ # only-gnu # only-linux --include ../tools.mk +include ../tools.mk # This ensures that std::env::args works in a library called from C on glibc Linux. diff --git a/src/test/run-make-fulldeps/hir-tree/Makefile b/src/test/run-make-fulldeps/hir-tree/Makefile index 3412c8ce1f5..b0450ea4bc5 100644 --- a/src/test/run-make-fulldeps/hir-tree/Makefile +++ b/src/test/run-make-fulldeps/hir-tree/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test that hir-tree output doesn't crash and includes # the string constant we would expect to see. diff --git a/src/test/run-make-fulldeps/include_bytes_deps/Makefile b/src/test/run-make-fulldeps/include_bytes_deps/Makefile index f91af88efe1..696dfd207bb 100644 --- a/src/test/run-make-fulldeps/include_bytes_deps/Makefile +++ b/src/test/run-make-fulldeps/include_bytes_deps/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-freebsd diff --git a/src/test/run-make-fulldeps/incr-add-rust-src-component/Makefile b/src/test/run-make-fulldeps/incr-add-rust-src-component/Makefile index 371f94715a8..5c1d953cc05 100644 --- a/src/test/run-make-fulldeps/incr-add-rust-src-component/Makefile +++ b/src/test/run-make-fulldeps/incr-add-rust-src-component/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # rust-lang/rust#70924: Test that if we add rust-src component in between two # incremental compiles, the compiler does not ICE on the second. diff --git a/src/test/run-make-fulldeps/inline-always-many-cgu/Makefile b/src/test/run-make-fulldeps/inline-always-many-cgu/Makefile index 0cab955f644..9945821db28 100644 --- a/src/test/run-make-fulldeps/inline-always-many-cgu/Makefile +++ b/src/test/run-make-fulldeps/inline-always-many-cgu/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs --emit llvm-ir -C codegen-units=2 diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile b/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile index 0a50859cdaa..dc5b55a9925 100644 --- a/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile +++ b/src/test/run-make-fulldeps/interdependent-c-libraries/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # The rust crate foo will link to the native library foo, while the rust crate # bar will link to the native library bar. There is also a dependency between diff --git a/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile b/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile index 2037728568e..3c4dade0f52 100644 --- a/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile +++ b/src/test/run-make-fulldeps/intrinsic-unreachable/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows-msvc # diff --git a/src/test/run-make-fulldeps/invalid-library/Makefile b/src/test/run-make-fulldeps/invalid-library/Makefile index de463a33014..910d9af7b05 100644 --- a/src/test/run-make-fulldeps/invalid-library/Makefile +++ b/src/test/run-make-fulldeps/invalid-library/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: touch $(TMPDIR)/lib.rmeta diff --git a/src/test/run-make-fulldeps/invalid-staticlib/Makefile b/src/test/run-make-fulldeps/invalid-staticlib/Makefile index 3a91902ccce..3f0f74ce3cb 100644 --- a/src/test/run-make-fulldeps/invalid-staticlib/Makefile +++ b/src/test/run-make-fulldeps/invalid-staticlib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: touch $(TMPDIR)/libfoo.a diff --git a/src/test/run-make-fulldeps/issue-11908/Makefile b/src/test/run-make-fulldeps/issue-11908/Makefile index cf6572c27ad..47005537e41 100644 --- a/src/test/run-make-fulldeps/issue-11908/Makefile +++ b/src/test/run-make-fulldeps/issue-11908/Makefile @@ -5,7 +5,7 @@ # and then our aux-built libraries will collide with liburl (they have # the same version listed) --include ../tools.mk +include ../tools.mk all: mkdir $(TMPDIR)/other diff --git a/src/test/run-make-fulldeps/issue-14500/Makefile b/src/test/run-make-fulldeps/issue-14500/Makefile index 0c0e331da1d..52550e57018 100644 --- a/src/test/run-make-fulldeps/issue-14500/Makefile +++ b/src/test/run-make-fulldeps/issue-14500/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # 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 diff --git a/src/test/run-make-fulldeps/issue-14698/Makefile b/src/test/run-make-fulldeps/issue-14698/Makefile index dbe8317dbc4..a1cfb5abab5 100644 --- a/src/test/run-make-fulldeps/issue-14698/Makefile +++ b/src/test/run-make-fulldeps/issue-14698/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: TMP=fake TMPDIR=fake $(RUSTC) foo.rs 2>&1 | $(CGREP) "couldn't create a temp dir:" diff --git a/src/test/run-make-fulldeps/issue-15460/Makefile b/src/test/run-make-fulldeps/issue-15460/Makefile index 846805686a1..1648d0c0c9b 100644 --- a/src/test/run-make-fulldeps/issue-15460/Makefile +++ b/src/test/run-make-fulldeps/issue-15460/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,foo) $(RUSTC) foo.rs -C extra-filename=-383hf8 -C prefer-dynamic diff --git a/src/test/run-make-fulldeps/issue-18943/Makefile b/src/test/run-make-fulldeps/issue-18943/Makefile index bef70a0edaa..fc40d756d6f 100644 --- a/src/test/run-make-fulldeps/issue-18943/Makefile +++ b/src/test/run-make-fulldeps/issue-18943/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Regression test for ICE #18943 when compiling as lib diff --git a/src/test/run-make-fulldeps/issue-19371/Makefile b/src/test/run-make-fulldeps/issue-19371/Makefile index 9f3ec78465b..994e50801c8 100644 --- a/src/test/run-make-fulldeps/issue-19371/Makefile +++ b/src/test/run-make-fulldeps/issue-19371/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # This test ensures that rustc compile_input can be called twice in one task # without causing a panic. diff --git a/src/test/run-make-fulldeps/issue-20626/Makefile b/src/test/run-make-fulldeps/issue-20626/Makefile index 0487b240400..f76f31e794a 100644 --- a/src/test/run-make-fulldeps/issue-20626/Makefile +++ b/src/test/run-make-fulldeps/issue-20626/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test output to be four # The original error only occurred when printing, not when comparing using assert! diff --git a/src/test/run-make-fulldeps/issue-22131/Makefile b/src/test/run-make-fulldeps/issue-22131/Makefile index d76aaf5c146..770f4b04ec3 100644 --- a/src/test/run-make-fulldeps/issue-22131/Makefile +++ b/src/test/run-make-fulldeps/issue-22131/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: foo.rs $(RUSTC) --cfg 'feature="bar"' --crate-type lib foo.rs diff --git a/src/test/run-make-fulldeps/issue-24445/Makefile b/src/test/run-make-fulldeps/issue-24445/Makefile index f7ad238af14..2a12226a6c0 100644 --- a/src/test/run-make-fulldeps/issue-24445/Makefile +++ b/src/test/run-make-fulldeps/issue-24445/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # only-linux diff --git a/src/test/run-make-fulldeps/issue-25581/Makefile b/src/test/run-make-fulldeps/issue-25581/Makefile index 042048ec25f..4f5d026f213 100644 --- a/src/test/run-make-fulldeps/issue-25581/Makefile +++ b/src/test/run-make-fulldeps/issue-25581/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,test) $(RUSTC) test.rs diff --git a/src/test/run-make-fulldeps/issue-26006/Makefile b/src/test/run-make-fulldeps/issue-26006/Makefile index dd023c32ba2..0ff07302002 100644 --- a/src/test/run-make-fulldeps/issue-26006/Makefile +++ b/src/test/run-make-fulldeps/issue-26006/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows diff --git a/src/test/run-make-fulldeps/issue-26092/Makefile b/src/test/run-make-fulldeps/issue-26092/Makefile index 885f45a0224..96822e7690b 100644 --- a/src/test/run-make-fulldeps/issue-26092/Makefile +++ b/src/test/run-make-fulldeps/issue-26092/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # This test ensures that rustc does not panic with `-o ""` option. diff --git a/src/test/run-make-fulldeps/issue-28595/Makefile b/src/test/run-make-fulldeps/issue-28595/Makefile index 61e9d0c6547..30a1d9c560a 100644 --- a/src/test/run-make-fulldeps/issue-28595/Makefile +++ b/src/test/run-make-fulldeps/issue-28595/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,a) $(call NATIVE_STATICLIB,b) $(RUSTC) a.rs diff --git a/src/test/run-make-fulldeps/issue-28766/Makefile b/src/test/run-make-fulldeps/issue-28766/Makefile index 1f47ef15b27..96d0bdc2b2a 100644 --- a/src/test/run-make-fulldeps/issue-28766/Makefile +++ b/src/test/run-make-fulldeps/issue-28766/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) -O foo.rs diff --git a/src/test/run-make-fulldeps/issue-30063/Makefile b/src/test/run-make-fulldeps/issue-30063/Makefile index a76051dc81e..e4ede598f7b 100644 --- a/src/test/run-make-fulldeps/issue-30063/Makefile +++ b/src/test/run-make-fulldeps/issue-30063/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: rm -f $(TMPDIR)/foo-output diff --git a/src/test/run-make-fulldeps/issue-33329/Makefile b/src/test/run-make-fulldeps/issue-33329/Makefile index 591e4e3dda3..9c149440d8e 100644 --- a/src/test/run-make-fulldeps/issue-33329/Makefile +++ b/src/test/run-make-fulldeps/issue-33329/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) --target x86_64_unknown-linux-musl main.rs 2>&1 | $(CGREP) \ diff --git a/src/test/run-make-fulldeps/issue-35164/Makefile b/src/test/run-make-fulldeps/issue-35164/Makefile index a95125c566e..38aa6f1265f 100644 --- a/src/test/run-make-fulldeps/issue-35164/Makefile +++ b/src/test/run-make-fulldeps/issue-35164/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) main.rs --error-format json 2>&1 | $(CGREP) -e '"byte_start":23\b' '"byte_end":29\b' diff --git a/src/test/run-make-fulldeps/issue-37839/Makefile b/src/test/run-make-fulldeps/issue-37839/Makefile index f17ce537fb8..de50bd71379 100644 --- a/src/test/run-make-fulldeps/issue-37839/Makefile +++ b/src/test/run-make-fulldeps/issue-37839/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) a.rs && $(RUSTC) b.rs diff --git a/src/test/run-make-fulldeps/issue-37893/Makefile b/src/test/run-make-fulldeps/issue-37893/Makefile index 27b69baf977..33a60830e5d 100644 --- a/src/test/run-make-fulldeps/issue-37893/Makefile +++ b/src/test/run-make-fulldeps/issue-37893/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) a.rs && $(RUSTC) b.rs && $(RUSTC) c.rs diff --git a/src/test/run-make-fulldeps/issue-38237/Makefile b/src/test/run-make-fulldeps/issue-38237/Makefile index 0a681401b1a..75121d04012 100644 --- a/src/test/run-make-fulldeps/issue-38237/Makefile +++ b/src/test/run-make-fulldeps/issue-38237/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs; $(RUSTC) bar.rs diff --git a/src/test/run-make-fulldeps/issue-40535/Makefile b/src/test/run-make-fulldeps/issue-40535/Makefile index 49db1d43e47..155c8825214 100644 --- a/src/test/run-make-fulldeps/issue-40535/Makefile +++ b/src/test/run-make-fulldeps/issue-40535/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # The ICE occurred in the following situation: # * `foo` declares `extern crate bar, baz`, depends only on `bar` (forgetting `baz` in `Cargo.toml`) diff --git a/src/test/run-make-fulldeps/issue-46239/Makefile b/src/test/run-make-fulldeps/issue-46239/Makefile index 698a605f7e9..a93ef321298 100644 --- a/src/test/run-make-fulldeps/issue-46239/Makefile +++ b/src/test/run-make-fulldeps/issue-46239/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) main.rs -C opt-level=1 diff --git a/src/test/run-make-fulldeps/issue-47551/Makefile b/src/test/run-make-fulldeps/issue-47551/Makefile index f4495e6b671..5a6ac725701 100644 --- a/src/test/run-make-fulldeps/issue-47551/Makefile +++ b/src/test/run-make-fulldeps/issue-47551/Makefile @@ -1,7 +1,7 @@ # only-linux # ignore-32bit --include ../tools.mk +include ../tools.mk all: $(RUSTC) eh_frame-terminator.rs diff --git a/src/test/run-make-fulldeps/issue-51671/Makefile b/src/test/run-make-fulldeps/issue-51671/Makefile index ba3d3b71007..1d1d370d382 100644 --- a/src/test/run-make-fulldeps/issue-51671/Makefile +++ b/src/test/run-make-fulldeps/issue-51671/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows-msvc diff --git a/src/test/run-make-fulldeps/issue-53964/Makefile b/src/test/run-make-fulldeps/issue-53964/Makefile index c56beb52fdd..6bd83021374 100644 --- a/src/test/run-make-fulldeps/issue-53964/Makefile +++ b/src/test/run-make-fulldeps/issue-53964/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) panic.rs diff --git a/src/test/run-make-fulldeps/issue-64153/Makefile b/src/test/run-make-fulldeps/issue-64153/Makefile index 9c0c3fe6e01..51dc6b53a45 100644 --- a/src/test/run-make-fulldeps/issue-64153/Makefile +++ b/src/test/run-make-fulldeps/issue-64153/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # `llvm-objdump`'s output looks different on windows than on other platforms. # It should be enough to check on Unix platforms, so: diff --git a/src/test/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile b/src/test/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile index 2f16ad32859..13983f4ffe0 100644 --- a/src/test/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile +++ b/src/test/run-make-fulldeps/issue-68794-textrel-on-minimal-lib/Makefile @@ -6,7 +6,7 @@ # The test links a rust static library into a shared library, and checks that # the linker doesn't have to flag the resulting file as containing TEXTRELs. --include ../tools.mk +include ../tools.mk # only-linux diff --git a/src/test/run-make-fulldeps/issue-69368/Makefile b/src/test/run-make-fulldeps/issue-69368/Makefile index dbb044d8f5d..41770475db0 100644 --- a/src/test/run-make-fulldeps/issue-69368/Makefile +++ b/src/test/run-make-fulldeps/issue-69368/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test that previously triggered a linker failure with root cause # similar to one found in the issue #69368. diff --git a/src/test/run-make-fulldeps/issue-7349/Makefile b/src/test/run-make-fulldeps/issue-7349/Makefile index 9658b99e3b0..dc073b77fe1 100644 --- a/src/test/run-make-fulldeps/issue-7349/Makefile +++ b/src/test/run-make-fulldeps/issue-7349/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test to make sure that inner functions within a polymorphic outer function # don't get re-codegened when the outer function is monomorphized. The test diff --git a/src/test/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile b/src/test/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile index 157edb20c30..879ce174339 100644 --- a/src/test/run-make-fulldeps/issue-84395-lto-embed-bitcode/Makefile +++ b/src/test/run-make-fulldeps/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 ../../run-make-fulldeps/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/src/test/run-make-fulldeps/issue64319/Makefile b/src/test/run-make-fulldeps/issue64319/Makefile index 5592f5a71ff..ee0d177abc9 100644 --- a/src/test/run-make-fulldeps/issue64319/Makefile +++ b/src/test/run-make-fulldeps/issue64319/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/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/src/test/run-make-fulldeps/issues-41478-43796/Makefile b/src/test/run-make-fulldeps/issues-41478-43796/Makefile index f9735253ab6..e451cb03126 100644 --- a/src/test/run-make-fulldeps/issues-41478-43796/Makefile +++ b/src/test/run-make-fulldeps/issues-41478-43796/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: # Work in /tmp, because we need to create the `save-analysis-temp` folder. diff --git a/src/test/run-make-fulldeps/libs-through-symlinks/Makefile b/src/test/run-make-fulldeps/libs-through-symlinks/Makefile index 8be2e234fea..45deaecb840 100644 --- a/src/test/run-make-fulldeps/libs-through-symlinks/Makefile +++ b/src/test/run-make-fulldeps/libs-through-symlinks/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows diff --git a/src/test/run-make-fulldeps/libtest-json/Makefile b/src/test/run-make-fulldeps/libtest-json/Makefile index 67b5fc2ed32..37b6cb9e2d4 100644 --- a/src/test/run-make-fulldeps/libtest-json/Makefile +++ b/src/test/run-make-fulldeps/libtest-json/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test expected libtest's JSON output diff --git a/src/test/run-make-fulldeps/link-arg/Makefile b/src/test/run-make-fulldeps/link-arg/Makefile index 0360ede7625..103527c3e14 100644 --- a/src/test/run-make-fulldeps/link-arg/Makefile +++ b/src/test/run-make-fulldeps/link-arg/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk RUSTC_FLAGS = -C link-arg="-lfoo" -C link-arg="-lbar" --print link-args all: diff --git a/src/test/run-make-fulldeps/link-args-order/Makefile b/src/test/run-make-fulldeps/link-args-order/Makefile index f94e882ccb6..c562cc1b396 100644 --- a/src/test/run-make-fulldeps/link-args-order/Makefile +++ b/src/test/run-make-fulldeps/link-args-order/Makefile @@ -1,6 +1,6 @@ # ignore-msvc --include ../tools.mk +include ../tools.mk RUSTC_FLAGS = -C linker-flavor=ld -C link-arg=a -C link-args="b c" -C link-args="d e" -C link-arg=f RUSTC_FLAGS_PRE = -C linker-flavor=ld -Z pre-link-arg=a -Z pre-link-args="b c" -Z pre-link-args="d e" -Z pre-link-arg=f diff --git a/src/test/run-make-fulldeps/link-cfg/Makefile b/src/test/run-make-fulldeps/link-cfg/Makefile index 2701b4a593c..0b25ccded06 100644 --- a/src/test/run-make-fulldeps/link-cfg/Makefile +++ b/src/test/run-make-fulldeps/link-cfg/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call DYLIB,return1) $(call DYLIB,return2) $(call NATIVE_STATICLIB,return3) ls $(TMPDIR) diff --git a/src/test/run-make-fulldeps/link-dedup/Makefile b/src/test/run-make-fulldeps/link-dedup/Makefile index 4e7ce0f02d4..5c960335298 100644 --- a/src/test/run-make-fulldeps/link-dedup/Makefile +++ b/src/test/run-make-fulldeps/link-dedup/Makefile @@ -1,6 +1,6 @@ # ignore-msvc --include ../tools.mk +include ../tools.mk all: $(RUSTC) depa.rs diff --git a/src/test/run-make-fulldeps/link-path-order/Makefile b/src/test/run-make-fulldeps/link-path-order/Makefile index eeea0e3714e..ed7c299e61a 100644 --- a/src/test/run-make-fulldeps/link-path-order/Makefile +++ b/src/test/run-make-fulldeps/link-path-order/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Verifies that the -L arguments given to the linker is in the same order # as the -L arguments on the rustc command line. diff --git a/src/test/run-make-fulldeps/linkage-attr-on-static/Makefile b/src/test/run-make-fulldeps/linkage-attr-on-static/Makefile index 4befbe14465..7cc54e40a3a 100644 --- a/src/test/run-make-fulldeps/linkage-attr-on-static/Makefile +++ b/src/test/run-make-fulldeps/linkage-attr-on-static/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,foo) $(RUSTC) bar.rs diff --git a/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile index debe9e93824..a38f4fe5dc5 100644 --- a/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile +++ b/src/test/run-make-fulldeps/long-linker-command-lines-cmd-exe/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs -g diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile index 5876fbc94bc..00199ca970d 100644 --- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile +++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs -g -O diff --git a/src/test/run-make-fulldeps/longjmp-across-rust/Makefile b/src/test/run-make-fulldeps/longjmp-across-rust/Makefile index 9d71ed8fcf3..848638d82dd 100644 --- a/src/test/run-make-fulldeps/longjmp-across-rust/Makefile +++ b/src/test/run-make-fulldeps/longjmp-across-rust/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,foo) $(RUSTC) main.rs diff --git a/src/test/run-make-fulldeps/ls-metadata/Makefile b/src/test/run-make-fulldeps/ls-metadata/Makefile index fc3f5bce0cd..e0f916a248e 100644 --- a/src/test/run-make-fulldeps/ls-metadata/Makefile +++ b/src/test/run-make-fulldeps/ls-metadata/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs diff --git a/src/test/run-make-fulldeps/lto-dylib-dep/Makefile b/src/test/run-make-fulldeps/lto-dylib-dep/Makefile index ab8ee6c2ef7..41487b23c74 100644 --- a/src/test/run-make-fulldeps/lto-dylib-dep/Makefile +++ b/src/test/run-make-fulldeps/lto-dylib-dep/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test that we don't run into an assertion when using a Rust dylib dependency # while compiling with full LTO. diff --git a/src/test/run-make-fulldeps/lto-empty/Makefile b/src/test/run-make-fulldeps/lto-empty/Makefile index 345d10bc4b9..b4345ba1883 100644 --- a/src/test/run-make-fulldeps/lto-empty/Makefile +++ b/src/test/run-make-fulldeps/lto-empty/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: cdylib-fat cdylib-thin diff --git a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/Makefile b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/Makefile index 25afad92adb..e576ee37cf7 100644 --- a/src/test/run-make-fulldeps/lto-no-link-whole-rlib/Makefile +++ b/src/test/run-make-fulldeps/lto-no-link-whole-rlib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,foo) $(call NATIVE_STATICLIB,bar) $(RUSTC) lib1.rs diff --git a/src/test/run-make-fulldeps/lto-readonly-lib/Makefile b/src/test/run-make-fulldeps/lto-readonly-lib/Makefile index 0afbbc3450a..a20ecea88ea 100644 --- a/src/test/run-make-fulldeps/lto-readonly-lib/Makefile +++ b/src/test/run-make-fulldeps/lto-readonly-lib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) lib.rs diff --git a/src/test/run-make-fulldeps/lto-smoke-c/Makefile b/src/test/run-make-fulldeps/lto-smoke-c/Makefile index 0f61f5de938..7c6ee3be849 100644 --- a/src/test/run-make-fulldeps/lto-smoke-c/Makefile +++ b/src/test/run-make-fulldeps/lto-smoke-c/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Apparently older versions of GCC segfault if -g is passed... CC := $(CC:-g=) diff --git a/src/test/run-make-fulldeps/lto-smoke/Makefile b/src/test/run-make-fulldeps/lto-smoke/Makefile index 9b1dc2550b2..8bce708b44b 100644 --- a/src/test/run-make-fulldeps/lto-smoke/Makefile +++ b/src/test/run-make-fulldeps/lto-smoke/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: noparam bool_true bool_false thin fat diff --git a/src/test/run-make-fulldeps/manual-crate-name/Makefile b/src/test/run-make-fulldeps/manual-crate-name/Makefile index 1d1419997a2..c00e20c7c57 100644 --- a/src/test/run-make-fulldeps/manual-crate-name/Makefile +++ b/src/test/run-make-fulldeps/manual-crate-name/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) --crate-name foo bar.rs diff --git a/src/test/run-make-fulldeps/manual-link/Makefile b/src/test/run-make-fulldeps/manual-link/Makefile index dccf0d99b0f..401f6eb440a 100644 --- a/src/test/run-make-fulldeps/manual-link/Makefile +++ b/src/test/run-make-fulldeps/manual-link/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(TMPDIR)/libbar.a $(RUSTC) foo.rs -lstatic=bar diff --git a/src/test/run-make-fulldeps/many-crates-but-no-match/Makefile b/src/test/run-make-fulldeps/many-crates-but-no-match/Makefile index e7268311b13..ca0ab8e9e5f 100644 --- a/src/test/run-make-fulldeps/many-crates-but-no-match/Makefile +++ b/src/test/run-make-fulldeps/many-crates-but-no-match/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Modelled after ui/changing-crates.rs test, but this one puts # more than one (mismatching) candidate crate into the search path, diff --git a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile index 3ffbba9444b..dc6b10f4e9d 100644 --- a/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile +++ b/src/test/run-make-fulldeps/metadata-flag-frobs-symbols/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs -C metadata=a -C extra-filename=-a diff --git a/src/test/run-make-fulldeps/min-global-align/Makefile b/src/test/run-make-fulldeps/min-global-align/Makefile index 62102747004..82f38749e00 100644 --- a/src/test/run-make-fulldeps/min-global-align/Makefile +++ b/src/test/run-make-fulldeps/min-global-align/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # only-linux diff --git a/src/test/run-make-fulldeps/mismatching-target-triples/Makefile b/src/test/run-make-fulldeps/mismatching-target-triples/Makefile index 1636e41b056..409388e0414 100644 --- a/src/test/run-make-fulldeps/mismatching-target-triples/Makefile +++ b/src/test/run-make-fulldeps/mismatching-target-triples/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Issue #10814 # diff --git a/src/test/run-make-fulldeps/missing-crate-dependency/Makefile b/src/test/run-make-fulldeps/missing-crate-dependency/Makefile index b5a5bf492ab..7c271ab8a90 100644 --- a/src/test/run-make-fulldeps/missing-crate-dependency/Makefile +++ b/src/test/run-make-fulldeps/missing-crate-dependency/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) --crate-type=rlib crateA.rs diff --git a/src/test/run-make-fulldeps/mixing-deps/Makefile b/src/test/run-make-fulldeps/mixing-deps/Makefile index 0e52d4a8bef..956e704ee16 100644 --- a/src/test/run-make-fulldeps/mixing-deps/Makefile +++ b/src/test/run-make-fulldeps/mixing-deps/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) both.rs -C prefer-dynamic diff --git a/src/test/run-make-fulldeps/mixing-formats/Makefile b/src/test/run-make-fulldeps/mixing-formats/Makefile index 48257669baf..b27e54257f9 100644 --- a/src/test/run-make-fulldeps/mixing-formats/Makefile +++ b/src/test/run-make-fulldeps/mixing-formats/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Testing various mixings of rlibs and dylibs. Makes sure that it's possible to # link an rlib to a dylib. The dependency tree among the file looks like: diff --git a/src/test/run-make-fulldeps/mixing-libs/Makefile b/src/test/run-make-fulldeps/mixing-libs/Makefile index babeeef164d..39cc0708ca1 100644 --- a/src/test/run-make-fulldeps/mixing-libs/Makefile +++ b/src/test/run-make-fulldeps/mixing-libs/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) rlib.rs diff --git a/src/test/run-make-fulldeps/msvc-opt-minsize/Makefile b/src/test/run-make-fulldeps/msvc-opt-minsize/Makefile index 1095a047dd1..a5f019f244e 100644 --- a/src/test/run-make-fulldeps/msvc-opt-minsize/Makefile +++ b/src/test/run-make-fulldeps/msvc-opt-minsize/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs -Copt-level=z 2>&1 diff --git a/src/test/run-make-fulldeps/multiple-emits/Makefile b/src/test/run-make-fulldeps/multiple-emits/Makefile index e126422835c..d1f29764485 100644 --- a/src/test/run-make-fulldeps/multiple-emits/Makefile +++ b/src/test/run-make-fulldeps/multiple-emits/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs --emit=asm,llvm-ir -o $(TMPDIR)/out 2>&1 diff --git a/src/test/run-make-fulldeps/no-builtins-lto/Makefile b/src/test/run-make-fulldeps/no-builtins-lto/Makefile index 2e41be39d5d..c8f05d9918b 100644 --- a/src/test/run-make-fulldeps/no-builtins-lto/Makefile +++ b/src/test/run-make-fulldeps/no-builtins-lto/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: # Compile a `#![no_builtins]` rlib crate diff --git a/src/test/run-make-fulldeps/no-duplicate-libs/Makefile b/src/test/run-make-fulldeps/no-duplicate-libs/Makefile index 13d8366c60a..b05aff7826e 100644 --- a/src/test/run-make-fulldeps/no-duplicate-libs/Makefile +++ b/src/test/run-make-fulldeps/no-duplicate-libs/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk ifdef IS_MSVC # FIXME(#27979) diff --git a/src/test/run-make-fulldeps/no-intermediate-extras/Makefile b/src/test/run-make-fulldeps/no-intermediate-extras/Makefile index 258cbf04c61..4116aac1b8f 100644 --- a/src/test/run-make-fulldeps/no-intermediate-extras/Makefile +++ b/src/test/run-make-fulldeps/no-intermediate-extras/Makefile @@ -1,6 +1,6 @@ # Regression test for issue #10973 --include ../tools.mk +include ../tools.mk all: $(RUSTC) --crate-type=rlib --test foo.rs diff --git a/src/test/run-make-fulldeps/obey-crate-type-flag/Makefile b/src/test/run-make-fulldeps/obey-crate-type-flag/Makefile index 903349152df..effcfc94cc5 100644 --- a/src/test/run-make-fulldeps/obey-crate-type-flag/Makefile +++ b/src/test/run-make-fulldeps/obey-crate-type-flag/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # check that rustc builds all crate_type attributes # delete rlib diff --git a/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile b/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile index 74e5dcfcf36..45221356cd9 100644 --- a/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile +++ b/src/test/run-make-fulldeps/output-filename-conflicts-with-directory/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: cp foo.rs $(TMPDIR)/foo.rs diff --git a/src/test/run-make-fulldeps/output-filename-overwrites-input/Makefile b/src/test/run-make-fulldeps/output-filename-overwrites-input/Makefile index 6377038b7be..33069c06f5a 100644 --- a/src/test/run-make-fulldeps/output-filename-overwrites-input/Makefile +++ b/src/test/run-make-fulldeps/output-filename-overwrites-input/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: cp foo.rs $(TMPDIR)/foo diff --git a/src/test/run-make-fulldeps/output-type-permutations/Makefile b/src/test/run-make-fulldeps/output-type-permutations/Makefile index b6e0cbaf5dd..791606c643b 100644 --- a/src/test/run-make-fulldeps/output-type-permutations/Makefile +++ b/src/test/run-make-fulldeps/output-type-permutations/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs --crate-type=rlib,dylib,staticlib diff --git a/src/test/run-make-fulldeps/output-with-hyphens/Makefile b/src/test/run-make-fulldeps/output-with-hyphens/Makefile index 69a286f0b74..365fb6e591a 100644 --- a/src/test/run-make-fulldeps/output-with-hyphens/Makefile +++ b/src/test/run-make-fulldeps/output-with-hyphens/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo-bar.rs --crate-type bin diff --git a/src/test/run-make-fulldeps/override-aliased-flags/Makefile b/src/test/run-make-fulldeps/override-aliased-flags/Makefile index bea610eeb9f..186b8c7c85e 100644 --- a/src/test/run-make-fulldeps/override-aliased-flags/Makefile +++ b/src/test/run-make-fulldeps/override-aliased-flags/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # FIXME: it would be good to check that it's actually the rightmost flags # that are used when multiple flags are specified, but I can't think of a diff --git a/src/test/run-make-fulldeps/panic-impl-transitive/Makefile b/src/test/run-make-fulldeps/panic-impl-transitive/Makefile index 1714578b2ba..c3192efcb5a 100644 --- a/src/test/run-make-fulldeps/panic-impl-transitive/Makefile +++ b/src/test/run-make-fulldeps/panic-impl-transitive/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/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/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile b/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile index f3d9357865c..42d3c977f75 100644 --- a/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile +++ b/src/test/run-make-fulldeps/pass-non-c-like-enum-to-c/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,test) $(RUSTC) nonclike.rs -L$(TMPDIR) -ltest diff --git a/src/test/run-make-fulldeps/pgo-branch-weights/Makefile b/src/test/run-make-fulldeps/pgo-branch-weights/Makefile index 9773e3f1fdf..c60206a1f34 100644 --- a/src/test/run-make-fulldeps/pgo-branch-weights/Makefile +++ b/src/test/run-make-fulldeps/pgo-branch-weights/Makefile @@ -4,7 +4,7 @@ # FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works # properly. Since we only have GCC on the CI ignore the test for now. --include ../tools.mk +include ../tools.mk # For some very small programs GNU ld seems to not properly handle # instrumentation sections correctly. Neither Gold nor LLD have that problem. diff --git a/src/test/run-make-fulldeps/pgo-gen-lto/Makefile b/src/test/run-make-fulldeps/pgo-gen-lto/Makefile index a7d5c561632..3f2f6a838b5 100644 --- a/src/test/run-make-fulldeps/pgo-gen-lto/Makefile +++ b/src/test/run-make-fulldeps/pgo-gen-lto/Makefile @@ -4,7 +4,7 @@ # FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works # properly. Since we only have GCC on the CI ignore the test for now. --include ../tools.mk +include ../tools.mk COMPILE_FLAGS=-Copt-level=3 -Clto=fat -Cprofile-generate="$(TMPDIR)" diff --git a/src/test/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile b/src/test/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile index 425bfc28a97..7f72b11b611 100644 --- a/src/test/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile +++ b/src/test/run-make-fulldeps/pgo-gen-no-imp-symbols/Makefile @@ -1,6 +1,6 @@ # needs-profiler-support --include ../tools.mk +include ../tools.mk COMPILE_FLAGS=-O -Ccodegen-units=1 -Cprofile-generate="$(TMPDIR)" diff --git a/src/test/run-make-fulldeps/pgo-gen/Makefile b/src/test/run-make-fulldeps/pgo-gen/Makefile index 6533355be34..4623a74957b 100644 --- a/src/test/run-make-fulldeps/pgo-gen/Makefile +++ b/src/test/run-make-fulldeps/pgo-gen/Makefile @@ -4,7 +4,7 @@ # FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works # properly. Since we only have GCC on the CI ignore the test for now. --include ../tools.mk +include ../tools.mk COMPILE_FLAGS=-g -Cprofile-generate="$(TMPDIR)" diff --git a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/Makefile b/src/test/run-make-fulldeps/pgo-indirect-call-promotion/Makefile index c0195dcbb31..45302215cc6 100644 --- a/src/test/run-make-fulldeps/pgo-indirect-call-promotion/Makefile +++ b/src/test/run-make-fulldeps/pgo-indirect-call-promotion/Makefile @@ -4,7 +4,7 @@ # FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works # properly. Since we only have GCC on the CI ignore the test for now. --include ../tools.mk +include ../tools.mk all: # We don't compile `opaque` with either optimizations or instrumentation. diff --git a/src/test/run-make-fulldeps/pgo-use/Makefile b/src/test/run-make-fulldeps/pgo-use/Makefile index d7863c9c587..3bac9b77aa3 100644 --- a/src/test/run-make-fulldeps/pgo-use/Makefile +++ b/src/test/run-make-fulldeps/pgo-use/Makefile @@ -4,7 +4,7 @@ # FIXME(mati865): MinGW GCC miscompiles compiler-rt profiling library but with Clang it works # properly. Since we only have GCC on the CI ignore the test for now. --include ../tools.mk +include ../tools.mk # This test makes sure that PGO profiling data leads to cold functions being # marked as `cold` and hot functions with `inlinehint`. diff --git a/src/test/run-make-fulldeps/pointer-auth-link-with-c/Makefile b/src/test/run-make-fulldeps/pointer-auth-link-with-c/Makefile index d0e22cfef4c..7acea03802c 100644 --- a/src/test/run-make-fulldeps/pointer-auth-link-with-c/Makefile +++ b/src/test/run-make-fulldeps/pointer-auth-link-with-c/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # only-aarch64 diff --git a/src/test/run-make-fulldeps/prefer-dylib/Makefile b/src/test/run-make-fulldeps/prefer-dylib/Makefile index bd44feecf2a..3817ca195eb 100644 --- a/src/test/run-make-fulldeps/prefer-dylib/Makefile +++ b/src/test/run-make-fulldeps/prefer-dylib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) bar.rs --crate-type=dylib --crate-type=rlib -C prefer-dynamic diff --git a/src/test/run-make-fulldeps/prefer-rlib/Makefile b/src/test/run-make-fulldeps/prefer-rlib/Makefile index c6a239eef08..adc345d760d 100644 --- a/src/test/run-make-fulldeps/prefer-rlib/Makefile +++ b/src/test/run-make-fulldeps/prefer-rlib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) bar.rs --crate-type=dylib --crate-type=rlib diff --git a/src/test/run-make-fulldeps/pretty-expanded/Makefile b/src/test/run-make-fulldeps/pretty-expanded/Makefile index e721c5afdd7..5a0097a8351 100644 --- a/src/test/run-make-fulldeps/pretty-expanded/Makefile +++ b/src/test/run-make-fulldeps/pretty-expanded/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) -o $(TMPDIR)/input.expanded.rs -Zunpretty=expanded input.rs diff --git a/src/test/run-make-fulldeps/pretty-print-to-file/Makefile b/src/test/run-make-fulldeps/pretty-print-to-file/Makefile index b224c52fcad..ca11b8c47f0 100644 --- a/src/test/run-make-fulldeps/pretty-print-to-file/Makefile +++ b/src/test/run-make-fulldeps/pretty-print-to-file/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) -o $(TMPDIR)/input.out -Zunpretty=normal input.rs diff --git a/src/test/run-make-fulldeps/print-cfg/Makefile b/src/test/run-make-fulldeps/print-cfg/Makefile index 5472baae3f2..126f5768c90 100644 --- a/src/test/run-make-fulldeps/print-cfg/Makefile +++ b/src/test/run-make-fulldeps/print-cfg/Makefile @@ -1,6 +1,6 @@ # needs-llvm-components: x86 arm --include ../tools.mk +include ../tools.mk all: default $(RUSTC) --target x86_64-pc-windows-gnu --print cfg | $(CGREP) windows diff --git a/src/test/run-make-fulldeps/print-target-list/Makefile b/src/test/run-make-fulldeps/print-target-list/Makefile index 5f10f2aa3b0..f23c40d4281 100644 --- a/src/test/run-make-fulldeps/print-target-list/Makefile +++ b/src/test/run-make-fulldeps/print-target-list/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Checks that all the targets returned by `rustc --print target-list` are valid # target specifications diff --git a/src/test/run-make-fulldeps/profile/Makefile b/src/test/run-make-fulldeps/profile/Makefile index 04d382b475e..fffc051adbf 100644 --- a/src/test/run-make-fulldeps/profile/Makefile +++ b/src/test/run-make-fulldeps/profile/Makefile @@ -1,6 +1,6 @@ # needs-profiler-support --include ../tools.mk +include ../tools.mk all: $(RUSTC) -g -Z profile test.rs diff --git a/src/test/run-make-fulldeps/prune-link-args/Makefile b/src/test/run-make-fulldeps/prune-link-args/Makefile index 3589f98e7e5..a359dc5aef1 100644 --- a/src/test/run-make-fulldeps/prune-link-args/Makefile +++ b/src/test/run-make-fulldeps/prune-link-args/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows diff --git a/src/test/run-make-fulldeps/redundant-libs/Makefile b/src/test/run-make-fulldeps/redundant-libs/Makefile index e09841fb42e..b2dff05d163 100644 --- a/src/test/run-make-fulldeps/redundant-libs/Makefile +++ b/src/test/run-make-fulldeps/redundant-libs/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows-msvc diff --git a/src/test/run-make-fulldeps/relocation-model/Makefile b/src/test/run-make-fulldeps/relocation-model/Makefile index 485ecbb4b5a..a31dbfd9167 100644 --- a/src/test/run-make-fulldeps/relocation-model/Makefile +++ b/src/test/run-make-fulldeps/relocation-model/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: others $(RUSTC) -C relocation-model=dynamic-no-pic foo.rs diff --git a/src/test/run-make-fulldeps/relro-levels/Makefile b/src/test/run-make-fulldeps/relro-levels/Makefile index aacb5acb7a3..6176fc1a589 100644 --- a/src/test/run-make-fulldeps/relro-levels/Makefile +++ b/src/test/run-make-fulldeps/relro-levels/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # only-linux # diff --git a/src/test/run-make-fulldeps/remap-path-prefix/Makefile b/src/test/run-make-fulldeps/remap-path-prefix/Makefile index 86785c59509..2a7378fdf9e 100644 --- a/src/test/run-make-fulldeps/remap-path-prefix/Makefile +++ b/src/test/run-make-fulldeps/remap-path-prefix/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows diff --git a/src/test/run-make-fulldeps/reproducible-build-2/Makefile b/src/test/run-make-fulldeps/reproducible-build-2/Makefile index fd94516fbba..1df5e102ce3 100644 --- a/src/test/run-make-fulldeps/reproducible-build-2/Makefile +++ b/src/test/run-make-fulldeps/reproducible-build-2/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-musl # ignore-windows diff --git a/src/test/run-make-fulldeps/reproducible-build/Makefile b/src/test/run-make-fulldeps/reproducible-build/Makefile index adccc153568..642a480815b 100644 --- a/src/test/run-make-fulldeps/reproducible-build/Makefile +++ b/src/test/run-make-fulldeps/reproducible-build/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-musl # Objects are reproducible but their path is not. diff --git a/src/test/run-make-fulldeps/resolve-rename/Makefile b/src/test/run-make-fulldeps/resolve-rename/Makefile index 4b0c36d01b7..00f83a5d6b2 100644 --- a/src/test/run-make-fulldeps/resolve-rename/Makefile +++ b/src/test/run-make-fulldeps/resolve-rename/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) -C extra-filename=-hash foo.rs diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile b/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile index f3d9357865c..42d3c977f75 100644 --- a/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile +++ b/src/test/run-make-fulldeps/return-non-c-like-enum-from-c/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,test) $(RUSTC) nonclike.rs -L$(TMPDIR) -ltest diff --git a/src/test/run-make-fulldeps/return-non-c-like-enum/Makefile b/src/test/run-make-fulldeps/return-non-c-like-enum/Makefile index 5b5d620efe6..513311c8289 100644 --- a/src/test/run-make-fulldeps/return-non-c-like-enum/Makefile +++ b/src/test/run-make-fulldeps/return-non-c-like-enum/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) --crate-type=staticlib nonclike.rs diff --git a/src/test/run-make-fulldeps/rlib-chain/Makefile b/src/test/run-make-fulldeps/rlib-chain/Makefile index 30b6811a388..236943a2a3b 100644 --- a/src/test/run-make-fulldeps/rlib-chain/Makefile +++ b/src/test/run-make-fulldeps/rlib-chain/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) m1.rs diff --git a/src/test/run-make-fulldeps/rustdoc-determinism/Makefile b/src/test/run-make-fulldeps/rustdoc-determinism/Makefile index 0534c2c3831..a3ef1690671 100644 --- a/src/test/run-make-fulldeps/rustdoc-determinism/Makefile +++ b/src/test/run-make-fulldeps/rustdoc-determinism/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Assert that the search index is generated deterministically, regardless of the # order that crates are documented in. diff --git a/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile b/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile index c9d41f0ec3b..2dc30f56b83 100644 --- a/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile +++ b/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test that hir-tree output doesn't crash and includes # the string constant we would expect to see. diff --git a/src/test/run-make-fulldeps/rustdoc-io-error/Makefile b/src/test/run-make-fulldeps/rustdoc-io-error/Makefile index f95fa88d41c..27f5ecf94ab 100644 --- a/src/test/run-make-fulldeps/rustdoc-io-error/Makefile +++ b/src/test/run-make-fulldeps/rustdoc-io-error/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # This test verifies that rustdoc doesn't ICE when it encounters an IO error # while generating files. Ideally this would be a rustdoc-ui test, so we could diff --git a/src/test/run-make-fulldeps/rustdoc-map-file/Makefile b/src/test/run-make-fulldeps/rustdoc-map-file/Makefile index ce977fa0cea..5cbf7747af6 100644 --- a/src/test/run-make-fulldeps/rustdoc-map-file/Makefile +++ b/src/test/run-make-fulldeps/rustdoc-map-file/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTDOC) -Z unstable-options --generate-redirect-map foo.rs -o "$(TMPDIR)/out" diff --git a/src/test/run-make-fulldeps/rustdoc-output-path/Makefile b/src/test/run-make-fulldeps/rustdoc-output-path/Makefile index 8ce1c699526..8f5cda9e56e 100644 --- a/src/test/run-make-fulldeps/rustdoc-output-path/Makefile +++ b/src/test/run-make-fulldeps/rustdoc-output-path/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTDOC) -o "$(TMPDIR)/foo/bar/doc" foo.rs diff --git a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile b/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile index 4934e875da6..c857aa4b993 100644 --- a/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile +++ b/src/test/run-make-fulldeps/rustdoc-scrape-examples-macros/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" DYLIB_NAME := $(shell echo | $(RUSTC) --crate-name foobar_macro --crate-type dylib --print file-names -) diff --git a/src/test/run-make-fulldeps/rustdoc-themes/Makefile b/src/test/run-make-fulldeps/rustdoc-themes/Makefile index f3d07b25c47..a6d9a43addf 100644 --- a/src/test/run-make-fulldeps/rustdoc-themes/Makefile +++ b/src/test/run-make-fulldeps/rustdoc-themes/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test that rustdoc will properly load in a theme file and display it in the theme selector. diff --git a/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile index e72fe5a5091..691585268bf 100644 --- a/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile +++ b/src/test/run-make-fulldeps/sanitizer-cdylib-link/Makefile @@ -1,7 +1,7 @@ # needs-sanitizer-support # needs-sanitizer-address --include ../tools.mk +include ../tools.mk LOG := $(TMPDIR)/log.txt diff --git a/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile index b9a3f829555..b0a91e5b197 100644 --- a/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile +++ b/src/test/run-make-fulldeps/sanitizer-dylib-link/Makefile @@ -1,7 +1,7 @@ # needs-sanitizer-support # needs-sanitizer-address --include ../tools.mk +include ../tools.mk LOG := $(TMPDIR)/log.txt diff --git a/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile b/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile index 4894f65b114..7b1a286ed12 100644 --- a/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile +++ b/src/test/run-make-fulldeps/sanitizer-staticlib-link/Makefile @@ -1,7 +1,7 @@ # needs-sanitizer-support # needs-sanitizer-address --include ../tools.mk +include ../tools.mk # This test first builds a staticlib with AddressSanitizer and checks that # linking it to an executable fails due to the missing sanitizer runtime. diff --git a/src/test/run-make-fulldeps/save-analysis-fail/Makefile b/src/test/run-make-fulldeps/save-analysis-fail/Makefile index f29f907cf38..69a2b274694 100644 --- a/src/test/run-make-fulldeps/save-analysis-fail/Makefile +++ b/src/test/run-make-fulldeps/save-analysis-fail/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: code krate2: krate2.rs $(RUSTC) $< diff --git a/src/test/run-make-fulldeps/save-analysis-rfc2126/Makefile b/src/test/run-make-fulldeps/save-analysis-rfc2126/Makefile index 36288c4b870..30f57034bba 100644 --- a/src/test/run-make-fulldeps/save-analysis-rfc2126/Makefile +++ b/src/test/run-make-fulldeps/save-analysis-rfc2126/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: extern_absolute_paths.rs krate2 $(RUSTC) extern_absolute_paths.rs -Zsave-analysis --edition=2018 --extern krate2 diff --git a/src/test/run-make-fulldeps/save-analysis/Makefile b/src/test/run-make-fulldeps/save-analysis/Makefile index 7296fb9cc59..b8b6be13dbd 100644 --- a/src/test/run-make-fulldeps/save-analysis/Makefile +++ b/src/test/run-make-fulldeps/save-analysis/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: code krate2: krate2.rs $(RUSTC) $< diff --git a/src/test/run-make-fulldeps/separate-link-fail/Makefile b/src/test/run-make-fulldeps/separate-link-fail/Makefile index c759f42a235..bfd18fbf972 100644 --- a/src/test/run-make-fulldeps/separate-link-fail/Makefile +++ b/src/test/run-make-fulldeps/separate-link-fail/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: echo 'fn main(){}' > $(TMPDIR)/main.rs diff --git a/src/test/run-make-fulldeps/separate-link/Makefile b/src/test/run-make-fulldeps/separate-link/Makefile index 060484e89f9..3ccdb6275d1 100644 --- a/src/test/run-make-fulldeps/separate-link/Makefile +++ b/src/test/run-make-fulldeps/separate-link/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: echo 'fn main(){}' | $(RUSTC) -Z no-link - diff --git a/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile b/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile index 77d1d71e9b2..df289d0b0b1 100644 --- a/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile +++ b/src/test/run-make-fulldeps/sepcomp-cci-copies/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Check that cross-crate inlined items are inlined in all compilation units # that refer to them, and not in any other compilation units. diff --git a/src/test/run-make-fulldeps/sepcomp-inlining/Makefile b/src/test/run-make-fulldeps/sepcomp-inlining/Makefile index 1d20d940000..327aeb75e5e 100644 --- a/src/test/run-make-fulldeps/sepcomp-inlining/Makefile +++ b/src/test/run-make-fulldeps/sepcomp-inlining/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test that #[inline] functions still get inlined across compilation unit # boundaries. Compilation should produce three IR files, but only the two diff --git a/src/test/run-make-fulldeps/sepcomp-separate/Makefile b/src/test/run-make-fulldeps/sepcomp-separate/Makefile index 5b8bdb0fad8..62cf54a88fb 100644 --- a/src/test/run-make-fulldeps/sepcomp-separate/Makefile +++ b/src/test/run-make-fulldeps/sepcomp-separate/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Test that separate compilation actually puts code into separate compilation # units. `foo.rs` defines `magic_fn` in three different modules, which should diff --git a/src/test/run-make-fulldeps/share-generics-dylib/Makefile b/src/test/run-make-fulldeps/share-generics-dylib/Makefile index 282cb2461f6..065fb574c3c 100644 --- a/src/test/run-make-fulldeps/share-generics-dylib/Makefile +++ b/src/test/run-make-fulldeps/share-generics-dylib/Makefile @@ -9,7 +9,7 @@ # # This is regression test for https://github.com/rust-lang/rust/issues/67276. --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk COMMON_ARGS=-Cprefer-dynamic -Zshare-generics=yes -Ccodegen-units=1 -Csymbol-mangling-version=v0 diff --git a/src/test/run-make-fulldeps/simd-ffi/Makefile b/src/test/run-make-fulldeps/simd-ffi/Makefile index e9c974a0137..29735347041 100644 --- a/src/test/run-make-fulldeps/simd-ffi/Makefile +++ b/src/test/run-make-fulldeps/simd-ffi/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk TARGETS = ifeq ($(filter arm,$(LLVM_COMPONENTS)),arm) diff --git a/src/test/run-make-fulldeps/simple-dylib/Makefile b/src/test/run-make-fulldeps/simple-dylib/Makefile index 26730820fea..5dda5d66d1c 100644 --- a/src/test/run-make-fulldeps/simple-dylib/Makefile +++ b/src/test/run-make-fulldeps/simple-dylib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) bar.rs --crate-type=dylib -C prefer-dynamic $(RUSTC) foo.rs diff --git a/src/test/run-make-fulldeps/simple-rlib/Makefile b/src/test/run-make-fulldeps/simple-rlib/Makefile index 7b156cb8748..d912b8a7bab 100644 --- a/src/test/run-make-fulldeps/simple-rlib/Makefile +++ b/src/test/run-make-fulldeps/simple-rlib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) bar.rs --crate-type=rlib $(RUSTC) foo.rs diff --git a/src/test/run-make-fulldeps/split-debuginfo/Makefile b/src/test/run-make-fulldeps/split-debuginfo/Makefile index e2dc64d8ce2..371fb5ffba2 100644 --- a/src/test/run-make-fulldeps/split-debuginfo/Makefile +++ b/src/test/run-make-fulldeps/split-debuginfo/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: off packed unpacked diff --git a/src/test/run-make-fulldeps/stable-symbol-names/Makefile b/src/test/run-make-fulldeps/stable-symbol-names/Makefile index 451af809b22..bbfb8e38881 100644 --- a/src/test/run-make-fulldeps/stable-symbol-names/Makefile +++ b/src/test/run-make-fulldeps/stable-symbol-names/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # The following command will: # 1. dump the symbols of a library using `nm` diff --git a/src/test/run-make-fulldeps/static-dylib-by-default/Makefile b/src/test/run-make-fulldeps/static-dylib-by-default/Makefile index 6409aa66ae0..eedd0b32092 100644 --- a/src/test/run-make-fulldeps/static-dylib-by-default/Makefile +++ b/src/test/run-make-fulldeps/static-dylib-by-default/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk TO_LINK := $(call DYLIB,bar) ifdef IS_MSVC diff --git a/src/test/run-make-fulldeps/static-extern-type/Makefile b/src/test/run-make-fulldeps/static-extern-type/Makefile index 5879fc0ce77..e9aa95e63a0 100644 --- a/src/test/run-make-fulldeps/static-extern-type/Makefile +++ b/src/test/run-make-fulldeps/static-extern-type/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(call NATIVE_STATICLIB,define-foo) $(RUSTC) -ldefine-foo use-foo.rs diff --git a/src/test/run-make-fulldeps/static-unwinding/Makefile b/src/test/run-make-fulldeps/static-unwinding/Makefile index cb039744265..9c755d4ab18 100644 --- a/src/test/run-make-fulldeps/static-unwinding/Makefile +++ b/src/test/run-make-fulldeps/static-unwinding/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) lib.rs diff --git a/src/test/run-make-fulldeps/staticlib-blank-lib/Makefile b/src/test/run-make-fulldeps/staticlib-blank-lib/Makefile index 92a278825c2..fcbf87758fb 100644 --- a/src/test/run-make-fulldeps/staticlib-blank-lib/Makefile +++ b/src/test/run-make-fulldeps/staticlib-blank-lib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(AR) crus $(TMPDIR)/libfoo.a foo.rs diff --git a/src/test/run-make-fulldeps/std-core-cycle/Makefile b/src/test/run-make-fulldeps/std-core-cycle/Makefile index ce3b2d46bbc..4f252863767 100644 --- a/src/test/run-make-fulldeps/std-core-cycle/Makefile +++ b/src/test/run-make-fulldeps/std-core-cycle/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk ifeq ($(UNAME),Darwin) FLAGS := diff --git a/src/test/run-make-fulldeps/stdin-non-utf8/Makefile b/src/test/run-make-fulldeps/stdin-non-utf8/Makefile index 7948c442616..709d4cf1408 100644 --- a/src/test/run-make-fulldeps/stdin-non-utf8/Makefile +++ b/src/test/run-make-fulldeps/stdin-non-utf8/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: cp non-utf8 $(TMPDIR)/non-utf.rs diff --git a/src/test/run-make-fulldeps/suspicious-library/Makefile b/src/test/run-make-fulldeps/suspicious-library/Makefile index 12f437075fb..2af9e85c228 100644 --- a/src/test/run-make-fulldeps/suspicious-library/Makefile +++ b/src/test/run-make-fulldeps/suspicious-library/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs -C prefer-dynamic diff --git a/src/test/run-make-fulldeps/symbols-include-type-name/Makefile b/src/test/run-make-fulldeps/symbols-include-type-name/Makefile index 0850a2633e5..ac26a852e36 100644 --- a/src/test/run-make-fulldeps/symbols-include-type-name/Makefile +++ b/src/test/run-make-fulldeps/symbols-include-type-name/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # Check that symbol names for methods include type names, instead of . diff --git a/src/test/run-make-fulldeps/symlinked-extern/Makefile b/src/test/run-make-fulldeps/symlinked-extern/Makefile index e5061fddead..058f43e857a 100644 --- a/src/test/run-make-fulldeps/symlinked-extern/Makefile +++ b/src/test/run-make-fulldeps/symlinked-extern/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows # `ln` is actually `cp` on msys. diff --git a/src/test/run-make-fulldeps/symlinked-libraries/Makefile b/src/test/run-make-fulldeps/symlinked-libraries/Makefile index 618ae87bfe3..576bf7e54be 100644 --- a/src/test/run-make-fulldeps/symlinked-libraries/Makefile +++ b/src/test/run-make-fulldeps/symlinked-libraries/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows # `ln` is actually `cp` on msys. diff --git a/src/test/run-make-fulldeps/symlinked-rlib/Makefile b/src/test/run-make-fulldeps/symlinked-rlib/Makefile index 996989ce4d8..49d3f220a35 100644 --- a/src/test/run-make-fulldeps/symlinked-rlib/Makefile +++ b/src/test/run-make-fulldeps/symlinked-rlib/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows # `ln` is actually `cp` on msys. diff --git a/src/test/run-make-fulldeps/target-cpu-native/Makefile b/src/test/run-make-fulldeps/target-cpu-native/Makefile index d152e9f76d3..eb3ca1e13aa 100644 --- a/src/test/run-make-fulldeps/target-cpu-native/Makefile +++ b/src/test/run-make-fulldeps/target-cpu-native/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # only-linux # only-x86_64 diff --git a/src/test/run-make-fulldeps/target-specs/Makefile b/src/test/run-make-fulldeps/target-specs/Makefile index fb95ee5539a..a33f5368e3c 100644 --- a/src/test/run-make-fulldeps/target-specs/Makefile +++ b/src/test/run-make-fulldeps/target-specs/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) foo.rs --target=my-awesome-platform.json --crate-type=lib --emit=asm $(CGREP) -v morestack < $(TMPDIR)/foo.s diff --git a/src/test/run-make-fulldeps/target-without-atomic-cas/Makefile b/src/test/run-make-fulldeps/target-without-atomic-cas/Makefile index 9868fc1d417..451f03d66cd 100644 --- a/src/test/run-make-fulldeps/target-without-atomic-cas/Makefile +++ b/src/test/run-make-fulldeps/target-without-atomic-cas/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # The target used below doesn't support atomic CAS operations. Verify that's the case all: diff --git a/src/test/run-make-fulldeps/test-harness/Makefile b/src/test/run-make-fulldeps/test-harness/Makefile index 39477c07ced..1fe059b07d2 100644 --- a/src/test/run-make-fulldeps/test-harness/Makefile +++ b/src/test/run-make-fulldeps/test-harness/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: # check that #[cfg_attr(..., ignore)] does the right thing. diff --git a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/Makefile b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/Makefile index 802b3df460a..9f4be712634 100644 --- a/src/test/run-make-fulldeps/type-mismatch-same-crate-name/Makefile +++ b/src/test/run-make-fulldeps/type-mismatch-same-crate-name/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: # compile two different versions of crateA diff --git a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile index 838b1a2719b..6ae53afad20 100644 --- a/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile +++ b/src/test/run-make-fulldeps/use-extern-for-plugins/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-freebsd # ignore-openbsd diff --git a/src/test/run-make-fulldeps/use-suggestions-rust-2018/Makefile b/src/test/run-make-fulldeps/use-suggestions-rust-2018/Makefile index fc39691c507..37cd6283c0a 100644 --- a/src/test/run-make-fulldeps/use-suggestions-rust-2018/Makefile +++ b/src/test/run-make-fulldeps/use-suggestions-rust-2018/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) ep-nested-lib.rs diff --git a/src/test/run-make-fulldeps/used-cdylib-macos/Makefile b/src/test/run-make-fulldeps/used-cdylib-macos/Makefile index 4828d9c8aad..38a4c31c7b3 100644 --- a/src/test/run-make-fulldeps/used-cdylib-macos/Makefile +++ b/src/test/run-make-fulldeps/used-cdylib-macos/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # only-macos # diff --git a/src/test/run-make-fulldeps/used/Makefile b/src/test/run-make-fulldeps/used/Makefile index 4d904472931..e80eb9e4020 100644 --- a/src/test/run-make-fulldeps/used/Makefile +++ b/src/test/run-make-fulldeps/used/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # ignore-windows-msvc diff --git a/src/test/run-make-fulldeps/version/Makefile b/src/test/run-make-fulldeps/version/Makefile index 23e14a9cb93..3a130545d69 100644 --- a/src/test/run-make-fulldeps/version/Makefile +++ b/src/test/run-make-fulldeps/version/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) -V diff --git a/src/test/run-make-fulldeps/volatile-intrinsics/Makefile b/src/test/run-make-fulldeps/volatile-intrinsics/Makefile index acbadbef9fb..2a78c7b9cfe 100644 --- a/src/test/run-make-fulldeps/volatile-intrinsics/Makefile +++ b/src/test/run-make-fulldeps/volatile-intrinsics/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: # The tests must pass... diff --git a/src/test/run-make-fulldeps/weird-output-filenames/Makefile b/src/test/run-make-fulldeps/weird-output-filenames/Makefile index f161fe9f8e8..d3a34e3b46e 100644 --- a/src/test/run-make-fulldeps/weird-output-filenames/Makefile +++ b/src/test/run-make-fulldeps/weird-output-filenames/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: cp foo.rs $(TMPDIR)/.foo.rs diff --git a/src/test/run-make-fulldeps/windows-binary-no-external-deps/Makefile b/src/test/run-make-fulldeps/windows-binary-no-external-deps/Makefile index f6adb6d7627..8960020fed5 100644 --- a/src/test/run-make-fulldeps/windows-binary-no-external-deps/Makefile +++ b/src/test/run-make-fulldeps/windows-binary-no-external-deps/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # only-windows diff --git a/src/test/run-make-fulldeps/windows-spawn/Makefile b/src/test/run-make-fulldeps/windows-spawn/Makefile index c09ce8109e6..b6cdb169bab 100644 --- a/src/test/run-make-fulldeps/windows-spawn/Makefile +++ b/src/test/run-make-fulldeps/windows-spawn/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk # only-windows diff --git a/src/test/run-make-fulldeps/windows-subsystem/Makefile b/src/test/run-make-fulldeps/windows-subsystem/Makefile index 34fb5db32f9..78c4e2ac1e8 100644 --- a/src/test/run-make-fulldeps/windows-subsystem/Makefile +++ b/src/test/run-make-fulldeps/windows-subsystem/Makefile @@ -1,4 +1,4 @@ --include ../tools.mk +include ../tools.mk all: $(RUSTC) windows.rs diff --git a/src/test/run-make/const_fn_mir/Makefile b/src/test/run-make/const_fn_mir/Makefile index 2aa0bc9d45d..ad5695093a1 100644 --- a/src/test/run-make/const_fn_mir/Makefile +++ b/src/test/run-make/const_fn_mir/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk all: $(RUSTC) main.rs --emit=mir -o "$(TMPDIR)"/dump.mir diff --git a/src/test/run-make/coverage-reports/Makefile b/src/test/run-make/coverage-reports/Makefile index 4e75672f275..cac881ece12 100644 --- a/src/test/run-make/coverage-reports/Makefile +++ b/src/test/run-make/coverage-reports/Makefile @@ -75,7 +75,7 @@ ifdef RUSTC_BLESS_TEST rm -f expected_* endif --include clear_expected_if_blessed +include clear_expected_if_blessed %: $(SOURCEDIR)/lib/%.rs # Compile the test library with coverage instrumentation diff --git a/src/test/run-make/dep-graph/Makefile b/src/test/run-make/dep-graph/Makefile index 88916022c7c..ae97b1672ae 100644 --- a/src/test/run-make/dep-graph/Makefile +++ b/src/test/run-make/dep-graph/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # ignore-cross-compile diff --git a/src/test/run-make/emit-named-files/Makefile b/src/test/run-make/emit-named-files/Makefile index 03eb83b97e3..e081fa4793b 100644 --- a/src/test/run-make/emit-named-files/Makefile +++ b/src/test/run-make/emit-named-files/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk OUT=$(TMPDIR)/emit diff --git a/src/test/run-make/emit-path-unhashed/Makefile b/src/test/run-make/emit-path-unhashed/Makefile index b6b2d8af648..c144d4aa92f 100644 --- a/src/test/run-make/emit-path-unhashed/Makefile +++ b/src/test/run-make/emit-path-unhashed/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk OUT=$(TMPDIR)/emit diff --git a/src/test/run-make/emit-shared-files/Makefile b/src/test/run-make/emit-shared-files/Makefile index 9f46883beaa..09b4c29c1dd 100644 --- a/src/test/run-make/emit-shared-files/Makefile +++ b/src/test/run-make/emit-shared-files/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk INVOCATION_ONLY = $(TMPDIR)/invocation-only TOOLCHAIN_ONLY = $(TMPDIR)/toolchain-only diff --git a/src/test/run-make/env-dep-info/Makefile b/src/test/run-make/env-dep-info/Makefile index 25d9a31c2d6..1675a61b167 100644 --- a/src/test/run-make/env-dep-info/Makefile +++ b/src/test/run-make/env-dep-info/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC` # instead of hardcoding them everywhere they're needed. diff --git a/src/test/run-make/export-executable-symbols/Makefile b/src/test/run-make/export-executable-symbols/Makefile index 5006f9cb8cf..daa77c99dcd 100644 --- a/src/test/run-make/export-executable-symbols/Makefile +++ b/src/test/run-make/export-executable-symbols/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # ignore-wasm32 # ignore-wasm64 diff --git a/src/test/run-make/fmt-write-bloat/Makefile b/src/test/run-make/fmt-write-bloat/Makefile index 26e08086a72..07e6e025e08 100644 --- a/src/test/run-make/fmt-write-bloat/Makefile +++ b/src/test/run-make/fmt-write-bloat/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # ignore-windows diff --git a/src/test/run-make/issue-10971-temps-dir/Makefile b/src/test/run-make/issue-10971-temps-dir/Makefile index 5ce27192603..e589bbffe60 100644 --- a/src/test/run-make/issue-10971-temps-dir/Makefile +++ b/src/test/run-make/issue-10971-temps-dir/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # Regression test for issue #10971 # Running two invocations in parallel would overwrite each other's temp files. diff --git a/src/test/run-make/issue-47384/Makefile b/src/test/run-make/issue-47384/Makefile index f10365f8c88..0aadf6c88c9 100644 --- a/src/test/run-make/issue-47384/Makefile +++ b/src/test/run-make/issue-47384/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-linux # ignore-cross-compile diff --git a/src/test/run-make/issue-71519/Makefile b/src/test/run-make/issue-71519/Makefile index 636665ec1d0..4475649ca92 100644 --- a/src/test/run-make/issue-71519/Makefile +++ b/src/test/run-make/issue-71519/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # needs-rust-lld all: diff --git a/src/test/run-make/issue-85401-static-mir/Makefile b/src/test/run-make/issue-85401-static-mir/Makefile index 5e094cb4d33..99590166bca 100644 --- a/src/test/run-make/issue-85401-static-mir/Makefile +++ b/src/test/run-make/issue-85401-static-mir/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # Regression test for issue #85401 # Verify that we do not ICE when trying to access MIR for statics, diff --git a/src/test/run-make/issue-85441/Makefile b/src/test/run-make/issue-85441/Makefile index c7ae708c173..f04b07d51fa 100644 --- a/src/test/run-make/issue-85441/Makefile +++ b/src/test/run-make/issue-85441/Makefile @@ -1,6 +1,6 @@ # only-windows-msvc --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # Tests that WS2_32.dll is not unnecessarily linked, see issue #85441 diff --git a/src/test/run-make/issue-88756-default-output/Makefile b/src/test/run-make/issue-88756-default-output/Makefile index cacbcbf3933..275c35c2629 100644 --- a/src/test/run-make/issue-88756-default-output/Makefile +++ b/src/test/run-make/issue-88756-default-output/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/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/src/test/run-make/issue-96498/Makefile b/src/test/run-make/issue-96498/Makefile index eae6400aee4..ce2b1b1ff7c 100644 --- a/src/test/run-make/issue-96498/Makefile +++ b/src/test/run-make/issue-96498/Makefile @@ -1,7 +1,7 @@ # only-windows # needs-rust-lld --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # Ensure that LLD can link all: diff --git a/src/test/run-make/libtest-thread-limit/Makefile b/src/test/run-make/libtest-thread-limit/Makefile index 29c1bc71d87..d43a89e60ca 100644 --- a/src/test/run-make/libtest-thread-limit/Makefile +++ b/src/test/run-make/libtest-thread-limit/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-linux diff --git a/src/test/run-make/llvm-outputs/Makefile b/src/test/run-make/llvm-outputs/Makefile index d7f67577b04..a3f25eba0b2 100644 --- a/src/test/run-make/llvm-outputs/Makefile +++ b/src/test/run-make/llvm-outputs/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk all: echo 'fn main() {}' | $(BARE_RUSTC) - --out-dir=$(TMPDIR)/random_directory_that_does_not_exist_ir/ --emit=llvm-ir diff --git a/src/test/run-make/native-link-modifier-bundle/Makefile b/src/test/run-make/native-link-modifier-bundle/Makefile index e4b0f74ac26..7c78d7783e0 100644 --- a/src/test/run-make/native-link-modifier-bundle/Makefile +++ b/src/test/run-make/native-link-modifier-bundle/Makefile @@ -1,7 +1,7 @@ # ignore-cross-compile # ignore-windows-msvc --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/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/src/test/run-make/native-link-modifier-whole-archive/Makefile b/src/test/run-make/native-link-modifier-whole-archive/Makefile index 967cb065cad..f26bd864ced 100644 --- a/src/test/run-make/native-link-modifier-whole-archive/Makefile +++ b/src/test/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 ../../run-make-fulldeps/tools.mk all: $(TMPDIR)/$(call BIN,directly_linked) \ $(TMPDIR)/$(call BIN,directly_linked_test_plus_whole_archive) \ diff --git a/src/test/run-make/pass-linker-flags-from-dep/Makefile b/src/test/run-make/pass-linker-flags-from-dep/Makefile index 365216b4c35..b9426326aea 100644 --- a/src/test/run-make/pass-linker-flags-from-dep/Makefile +++ b/src/test/run-make/pass-linker-flags-from-dep/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk all: # Build deps diff --git a/src/test/run-make/pass-linker-flags/Makefile b/src/test/run-make/pass-linker-flags/Makefile index 02b1e2179e1..a3efb8df6ac 100644 --- a/src/test/run-make/pass-linker-flags/Makefile +++ b/src/test/run-make/pass-linker-flags/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/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/src/test/run-make/raw-dylib-alt-calling-convention/Makefile b/src/test/run-make/raw-dylib-alt-calling-convention/Makefile index a254285ab76..03f8778d25d 100644 --- a/src/test/run-make/raw-dylib-alt-calling-convention/Makefile +++ b/src/test/run-make/raw-dylib-alt-calling-convention/Makefile @@ -3,7 +3,7 @@ # only-x86 # only-windows --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk all: $(RUSTC) --crate-type lib --crate-name raw_dylib_alt_calling_convention_test lib.rs diff --git a/src/test/run-make/raw-dylib-c/Makefile b/src/test/run-make/raw-dylib-c/Makefile index 713f665078e..f47ab24f4fb 100644 --- a/src/test/run-make/raw-dylib-c/Makefile +++ b/src/test/run-make/raw-dylib-c/Makefile @@ -2,7 +2,7 @@ # only-windows --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk all: $(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs diff --git a/src/test/run-make/raw-dylib-link-ordinal/Makefile b/src/test/run-make/raw-dylib-link-ordinal/Makefile index c9baa3c1ec9..b55a94dbc46 100644 --- a/src/test/run-make/raw-dylib-link-ordinal/Makefile +++ b/src/test/run-make/raw-dylib-link-ordinal/Makefile @@ -2,7 +2,7 @@ # only-windows --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk all: $(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs diff --git a/src/test/run-make/raw-dylib-stdcall-ordinal/Makefile b/src/test/run-make/raw-dylib-stdcall-ordinal/Makefile index 3360a97b5ff..b9deb7729c2 100644 --- a/src/test/run-make/raw-dylib-stdcall-ordinal/Makefile +++ b/src/test/run-make/raw-dylib-stdcall-ordinal/Makefile @@ -3,7 +3,7 @@ # only-x86 # only-windows --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk all: $(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs diff --git a/src/test/run-make/remap-path-prefix-dwarf/Makefile b/src/test/run-make/remap-path-prefix-dwarf/Makefile index 561a343d60b..fbaea7b68fe 100644 --- a/src/test/run-make/remap-path-prefix-dwarf/Makefile +++ b/src/test/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 ../../run-make-fulldeps/tools.mk all: \ abs_input_outside_working_dir \ diff --git a/src/test/run-make/rustc-macro-dep-files/Makefile b/src/test/run-make/rustc-macro-dep-files/Makefile index a08a63fb44b..6ae659db2e9 100644 --- a/src/test/run-make/rustc-macro-dep-files/Makefile +++ b/src/test/run-make/rustc-macro-dep-files/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC` # instead of hardcoding them everywhere they're needed. diff --git a/src/test/run-make/rustdoc-scrape-examples-invalid-expr/Makefile b/src/test/run-make/rustdoc-scrape-examples-invalid-expr/Makefile index dce8b83eefe..7786ff762cb 100644 --- a/src/test/run-make/rustdoc-scrape-examples-invalid-expr/Makefile +++ b/src/test/run-make/rustdoc-scrape-examples-invalid-expr/Makefile @@ -1,5 +1,5 @@ deps := ex --include ../rustdoc-scrape-examples-multiple/scrape.mk +include ../rustdoc-scrape-examples-multiple/scrape.mk all: scrape diff --git a/src/test/run-make/rustdoc-scrape-examples-multiple/Makefile b/src/test/run-make/rustdoc-scrape-examples-multiple/Makefile index 897805e4405..453a7d4bc8b 100644 --- a/src/test/run-make/rustdoc-scrape-examples-multiple/Makefile +++ b/src/test/run-make/rustdoc-scrape-examples-multiple/Makefile @@ -1,5 +1,5 @@ deps := ex ex2 --include ./scrape.mk +include ./scrape.mk all: scrape diff --git a/src/test/run-make/rustdoc-scrape-examples-multiple/scrape.mk b/src/test/run-make/rustdoc-scrape-examples-multiple/scrape.mk index d49b6c1f290..7a28d2145d5 100644 --- a/src/test/run-make/rustdoc-scrape-examples-multiple/scrape.mk +++ b/src/test/run-make/rustdoc-scrape-examples-multiple/scrape.mk @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" diff --git a/src/test/run-make/rustdoc-scrape-examples-ordering/Makefile b/src/test/run-make/rustdoc-scrape-examples-ordering/Makefile index 339d539bfd5..bf45b8148c0 100644 --- a/src/test/run-make/rustdoc-scrape-examples-ordering/Makefile +++ b/src/test/run-make/rustdoc-scrape-examples-ordering/Makefile @@ -1,5 +1,5 @@ deps := ex1 ex2 --include ../rustdoc-scrape-examples-multiple/scrape.mk +include ../rustdoc-scrape-examples-multiple/scrape.mk all: scrape diff --git a/src/test/run-make/rustdoc-scrape-examples-remap/Makefile b/src/test/run-make/rustdoc-scrape-examples-remap/Makefile index dce8b83eefe..7786ff762cb 100644 --- a/src/test/run-make/rustdoc-scrape-examples-remap/Makefile +++ b/src/test/run-make/rustdoc-scrape-examples-remap/Makefile @@ -1,5 +1,5 @@ deps := ex --include ../rustdoc-scrape-examples-multiple/scrape.mk +include ../rustdoc-scrape-examples-multiple/scrape.mk all: scrape diff --git a/src/test/run-make/rustdoc-scrape-examples-test/Makefile b/src/test/run-make/rustdoc-scrape-examples-test/Makefile index 9f80a8d9602..1235ead6751 100644 --- a/src/test/run-make/rustdoc-scrape-examples-test/Makefile +++ b/src/test/run-make/rustdoc-scrape-examples-test/Makefile @@ -1,6 +1,6 @@ extra_flags := --scrape-tests deps := ex --include ../rustdoc-scrape-examples-multiple/scrape.mk +include ../rustdoc-scrape-examples-multiple/scrape.mk all: scrape diff --git a/src/test/run-make/rustdoc-scrape-examples-whitespace/Makefile b/src/test/run-make/rustdoc-scrape-examples-whitespace/Makefile index dce8b83eefe..7786ff762cb 100644 --- a/src/test/run-make/rustdoc-scrape-examples-whitespace/Makefile +++ b/src/test/run-make/rustdoc-scrape-examples-whitespace/Makefile @@ -1,5 +1,5 @@ deps := ex --include ../rustdoc-scrape-examples-multiple/scrape.mk +include ../rustdoc-scrape-examples-multiple/scrape.mk all: scrape diff --git a/src/test/run-make/rustdoc-with-out-dir-option/Makefile b/src/test/run-make/rustdoc-with-out-dir-option/Makefile index f79fce8eeea..b3c3f5230c1 100644 --- a/src/test/run-make/rustdoc-with-out-dir-option/Makefile +++ b/src/test/run-make/rustdoc-with-out-dir-option/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" diff --git a/src/test/run-make/rustdoc-with-output-option/Makefile b/src/test/run-make/rustdoc-with-output-option/Makefile index 654f9672588..02093a35cfc 100644 --- a/src/test/run-make/rustdoc-with-output-option/Makefile +++ b/src/test/run-make/rustdoc-with-output-option/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" diff --git a/src/test/run-make/rustdoc-with-short-out-dir-option/Makefile b/src/test/run-make/rustdoc-with-short-out-dir-option/Makefile index 1e9ba71de26..dc5056a86dd 100644 --- a/src/test/run-make/rustdoc-with-short-out-dir-option/Makefile +++ b/src/test/run-make/rustdoc-with-short-out-dir-option/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk OUTPUT_DIR := "$(TMPDIR)/rustdoc" diff --git a/src/test/run-make/static-pie/Makefile b/src/test/run-make/static-pie/Makefile index 945ec1724ac..e71770636ee 100644 --- a/src/test/run-make/static-pie/Makefile +++ b/src/test/run-make/static-pie/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-x86_64 # only-linux diff --git a/src/test/run-make/thumb-none-cortex-m/Makefile b/src/test/run-make/thumb-none-cortex-m/Makefile index 13385369e44..aa046af95da 100644 --- a/src/test/run-make/thumb-none-cortex-m/Makefile +++ b/src/test/run-make/thumb-none-cortex-m/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # How to run this # $ ./x.py clean diff --git a/src/test/run-make/thumb-none-qemu/Makefile b/src/test/run-make/thumb-none-qemu/Makefile index ab8b90e154e..328758d41ba 100644 --- a/src/test/run-make/thumb-none-qemu/Makefile +++ b/src/test/run-make/thumb-none-qemu/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-thumb diff --git a/src/test/run-make/track-path-dep-info/Makefile b/src/test/run-make/track-path-dep-info/Makefile index 465d3744789..ee853943f8b 100644 --- a/src/test/run-make/track-path-dep-info/Makefile +++ b/src/test/run-make/track-path-dep-info/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC` # instead of hardcoding them everywhere they're needed. diff --git a/src/test/run-make/unstable-flag-required/Makefile b/src/test/run-make/unstable-flag-required/Makefile index b8769d5f690..d3a734fae77 100644 --- a/src/test/run-make/unstable-flag-required/Makefile +++ b/src/test/run-make/unstable-flag-required/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk all: $(RUSTDOC) --output-format=json x.html 2>&1 | diff - output-format-json.stderr diff --git a/src/test/run-make/wasm-abi/Makefile b/src/test/run-make/wasm-abi/Makefile index 61fc4e8f57f..e713ca1876d 100644 --- a/src/test/run-make/wasm-abi/Makefile +++ b/src/test/run-make/wasm-abi/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-wasm32-bare diff --git a/src/test/run-make/wasm-custom-section/Makefile b/src/test/run-make/wasm-custom-section/Makefile index 2f48b852566..92b0802e30a 100644 --- a/src/test/run-make/wasm-custom-section/Makefile +++ b/src/test/run-make/wasm-custom-section/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-wasm32-bare diff --git a/src/test/run-make/wasm-custom-sections-opt/Makefile b/src/test/run-make/wasm-custom-sections-opt/Makefile index 76698c0aae3..e5b45d96310 100644 --- a/src/test/run-make/wasm-custom-sections-opt/Makefile +++ b/src/test/run-make/wasm-custom-sections-opt/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-wasm32-bare diff --git a/src/test/run-make/wasm-export-all-symbols/Makefile b/src/test/run-make/wasm-export-all-symbols/Makefile index 7e47ba4850e..834f4d258db 100644 --- a/src/test/run-make/wasm-export-all-symbols/Makefile +++ b/src/test/run-make/wasm-export-all-symbols/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-wasm32-bare diff --git a/src/test/run-make/wasm-import-module/Makefile b/src/test/run-make/wasm-import-module/Makefile index fe63e66f242..18cef16aac3 100644 --- a/src/test/run-make/wasm-import-module/Makefile +++ b/src/test/run-make/wasm-import-module/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-wasm32-bare diff --git a/src/test/run-make/wasm-panic-small/Makefile b/src/test/run-make/wasm-panic-small/Makefile index 68397e4bc6e..2af9f71357e 100644 --- a/src/test/run-make/wasm-panic-small/Makefile +++ b/src/test/run-make/wasm-panic-small/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-wasm32-bare diff --git a/src/test/run-make/wasm-spurious-import/Makefile b/src/test/run-make/wasm-spurious-import/Makefile index 1bb59dc1bfa..6f50e6e554e 100644 --- a/src/test/run-make/wasm-spurious-import/Makefile +++ b/src/test/run-make/wasm-spurious-import/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-wasm32-bare diff --git a/src/test/run-make/wasm-stringify-ints-small/Makefile b/src/test/run-make/wasm-stringify-ints-small/Makefile index 01e1c6b0ce8..2fa2c954d4a 100644 --- a/src/test/run-make/wasm-stringify-ints-small/Makefile +++ b/src/test/run-make/wasm-stringify-ints-small/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk ifeq ($(TARGET),wasm32-unknown-unknown) all: diff --git a/src/test/run-make/wasm-symbols-different-module/Makefile b/src/test/run-make/wasm-symbols-different-module/Makefile index bb6a5d3c9d2..9e657222dea 100644 --- a/src/test/run-make/wasm-symbols-different-module/Makefile +++ b/src/test/run-make/wasm-symbols-different-module/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-wasm32-bare diff --git a/src/test/run-make/wasm-symbols-not-exported/Makefile b/src/test/run-make/wasm-symbols-not-exported/Makefile index 62bd0f0872e..60b0dee001f 100644 --- a/src/test/run-make/wasm-symbols-not-exported/Makefile +++ b/src/test/run-make/wasm-symbols-not-exported/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-wasm32-bare diff --git a/src/test/run-make/wasm-symbols-not-imported/Makefile b/src/test/run-make/wasm-symbols-not-imported/Makefile index 7a923375c18..dc7618c19a7 100644 --- a/src/test/run-make/wasm-symbols-not-imported/Makefile +++ b/src/test/run-make/wasm-symbols-not-imported/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk # only-wasm32-bare diff --git a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile b/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile index 6a04d343910..84dcd239351 100644 --- a/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile +++ b/src/test/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile @@ -1,4 +1,4 @@ --include ../../run-make-fulldeps/tools.mk +include ../../run-make-fulldeps/tools.mk #only-x86_64-fortanix-unknown-sgx