move tools.mk to run-make

apparently I missed some tests in the last commit. Rather than having dozens of tests use the long version, use the short version in `run-make` and the long version in `run-make-fulldeps` (which is now only three tests)
2024-11-22 06:44:35 +00:00 · 2023-03-30 07:58:50 -05:00 · 2023-03-30 07:58:50 -05:00 · 26e1ce7394
commit 26e1ce7394
parent 06b2d4b4ab
89 changed files with 88 additions and 88 deletions
--- a/tests/run-make-fulldeps/issue-19371/Makefile
+++ b/tests/run-make-fulldeps/issue-19371/Makefile
@ -1,4 +1,4 @@
-include ../tools.mk
+include ../../run-make/tools.mk

 # This test ensures that rustc compile_input can be called twice in one task
 # without causing a panic.
--- a/tests/run-make-fulldeps/obtain-borrowck/Makefile
+++ b/tests/run-make-fulldeps/obtain-borrowck/Makefile
@ -1,4 +1,4 @@
-include ../tools.mk
+include ../../run-make/tools.mk

 # This example shows how to implement a rustc driver that retrieves MIR bodies
 # together with the borrow checker information.
--- a/tests/run-make-fulldeps/pretty-expanded/Makefile
+++ b/tests/run-make-fulldeps/pretty-expanded/Makefile
@ -1,4 +1,4 @@
-include ../tools.mk
+include ../../run-make/tools.mk

 all:
 	$(RUSTC) -o $(TMPDIR)/input.expanded.rs -Zunpretty=expanded input.rs
--- a/tests/run-make/const_fn_mir/Makefile
+++ b/tests/run-make/const_fn_mir/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) main.rs --emit=mir -o "$(TMPDIR)"/dump.mir
--- a/tests/run-make/coverage/coverage_tools.mk
+++ b/tests/run-make/coverage/coverage_tools.mk
@ -3,4 +3,4 @@
 #
 # include ../coverage/coverage_tools.mk

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk
--- a/tests/run-make/crate-hash-rustc-version/Makefile
+++ b/tests/run-make/crate-hash-rustc-version/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # Ensure that crates compiled with different rustc versions cannot
 # be dynamically linked.
--- a/tests/run-make/dep-graph/Makefile
+++ b/tests/run-make/dep-graph/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # ignore-cross-compile

--- a/tests/run-make/doctests-keep-binaries/Makefile
+++ b/tests/run-make/doctests-keep-binaries/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # Check that valid binaries are persisted by running them, regardless of whether the --run or --no-run option is used.

--- a/tests/run-make/dump-mono-stats/Makefile
+++ b/tests/run-make/dump-mono-stats/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) --crate-type lib foo.rs -Z dump-mono-stats=$(TMPDIR) -Zdump-mono-stats-format=json
--- a/tests/run-make/emit-named-files/Makefile
+++ b/tests/run-make/emit-named-files/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 OUT=$(TMPDIR)/emit

--- a/tests/run-make/emit-path-unhashed/Makefile
+++ b/tests/run-make/emit-path-unhashed/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 OUT=$(TMPDIR)/emit

--- a/tests/run-make/emit-shared-files/Makefile
+++ b/tests/run-make/emit-shared-files/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 INVOCATION_ONLY = $(TMPDIR)/invocation-only
 TOOLCHAIN_ONLY = $(TMPDIR)/toolchain-only
--- a/tests/run-make/env-dep-info/Makefile
+++ b/tests/run-make/env-dep-info/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC`
 # instead of hardcoding them everywhere they're needed.
--- a/tests/run-make/export-executable-symbols/Makefile
+++ b/tests/run-make/export-executable-symbols/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # ignore-wasm32
 # ignore-wasm64
--- a/tests/run-make/fmt-write-bloat/Makefile
+++ b/tests/run-make/fmt-write-bloat/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # ignore-windows

--- a/tests/run-make/incr-foreign-head-span/Makefile
+++ b/tests/run-make/incr-foreign-head-span/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # ignore-none no-std is not supported
 # ignore-nvptx64-nvidia-cuda FIXME: can't find crate for 'std'
--- a/tests/run-make/incr-prev-body-beyond-eof/Makefile
+++ b/tests/run-make/incr-prev-body-beyond-eof/Makefile
@ -1,7 +1,7 @@
 # ignore-none no-std is not supported
 # ignore-nvptx64-nvidia-cuda FIXME: can't find crate for `std`

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # Tests that we don't ICE during incremental compilation after modifying a
 # function span such that its previous end line exceeds the number of lines
--- a/tests/run-make/incremental-session-fail/Makefile
+++ b/tests/run-make/incremental-session-fail/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 SESSION_DIR := $(TMPDIR)/session
 OUTPUT_FILE := $(TMPDIR)/build-output
--- a/tests/run-make/invalid-so/Makefile
+++ b/tests/run-make/invalid-so/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 DYLIB_NAME := $(shell echo | $(RUSTC) --crate-name foo --crate-type dylib --print file-names -)

--- a/tests/run-make/issue-10971-temps-dir/Makefile
+++ b/tests/run-make/issue-10971-temps-dir/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # Regression test for issue #10971
 # Running two invocations in parallel would overwrite each other's temp files.
--- a/tests/run-make/issue-36710/Makefile
+++ b/tests/run-make/issue-36710/Makefile
@ -6,7 +6,7 @@
 #                    (see dist-i586-gnu-i586-i686-musl Dockerfile)
 # ignore-sgx

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all: foo
 	$(call RUN,foo)
--- a/tests/run-make/issue-47384/Makefile
+++ b/tests/run-make/issue-47384/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-linux
 # ignore-cross-compile
--- a/tests/run-make/issue-71519/Makefile
+++ b/tests/run-make/issue-71519/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # ignore-msvc
 # needs-rust-lld
--- a/tests/run-make/issue-83045/Makefile
+++ b/tests/run-make/issue-83045/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # This test case creates a situation where the crate loader would run
 # into an ICE when confronted with an invalid setup where it cannot
--- a/tests/run-make/issue-83112-incr-test-moved-file/Makefile
+++ b/tests/run-make/issue-83112-incr-test-moved-file/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # ignore-none no-std is not supported
 # ignore-nvptx64-nvidia-cuda FIXME: can't find crate for 'std'
--- a/tests/run-make/issue-84395-lto-embed-bitcode/Makefile
+++ b/tests/run-make/issue-84395-lto-embed-bitcode/Makefile
@ -3,7 +3,7 @@
 # This test makes sure the embed bitcode in elf created with
 # lto-embed-bitcode=optimized is valid llvm BC module.

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) test.rs --target $(TARGET) -Clink-arg=-fuse-ld=lld -Clinker-plugin-lto -Clinker=$(CLANG) -Clink-arg=-Wl,--plugin-opt=-lto-embed-bitcode=optimized -Zemit-thin-lto=no
--- a/tests/run-make/issue-85019-moved-src-dir/Makefile
+++ b/tests/run-make/issue-85019-moved-src-dir/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 INCR=$(TMPDIR)/incr
 FIRST_SRC=$(TMPDIR)/first_src
--- a/tests/run-make/issue-85401-static-mir/Makefile
+++ b/tests/run-make/issue-85401-static-mir/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # Regression test for issue #85401
 # Verify that we do not ICE when trying to access MIR for statics,
--- a/tests/run-make/issue-85441/Makefile
+++ b/tests/run-make/issue-85441/Makefile
@ -1,6 +1,6 @@
 # only-windows-msvc

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # Tests that WS2_32.dll is not unnecessarily linked, see issue #85441

--- a/tests/run-make/issue-88756-default-output/Makefile
+++ b/tests/run-make/issue-88756-default-output/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(BARE_RUSTDOC) 2>&1 | sed -E 's@/nightly/|/beta/|/stable/|/1\.[0-9]+\.[0-9]+/@/$$CHANNEL/@g' | diff - output-default.stdout
--- a/tests/run-make/issue-96498/Makefile
+++ b/tests/run-make/issue-96498/Makefile
@ -1,7 +1,7 @@
 # only-windows
 # needs-rust-lld

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # Ensure that LLD can link
 all:
--- a/tests/run-make/issue-97463-abi-param-passing/Makefile
+++ b/tests/run-make/issue-97463-abi-param-passing/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # ignore-msvc

--- a/tests/run-make/issue64319/Makefile
+++ b/tests/run-make/issue64319/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # Different optimization levels imply different values for `-Zshare-generics`,
 # so try out a whole bunch of combinations to make sure everything is compatible
--- a/tests/run-make/jobserver-error/Makefile
+++ b/tests/run-make/jobserver-error/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-linux

--- a/tests/run-make/libtest-thread-limit/Makefile
+++ b/tests/run-make/libtest-thread-limit/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-linux

--- a/tests/run-make/llvm-outputs/Makefile
+++ b/tests/run-make/llvm-outputs/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	echo 'fn main() {}' | $(BARE_RUSTC) - --out-dir=$(TMPDIR)/random_directory_that_does_not_exist_ir/ --emit=llvm-ir
--- a/tests/run-make/macos-deployment-target/Makefile
+++ b/tests/run-make/macos-deployment-target/Makefile
@ -4,7 +4,7 @@
 # This is important since its a compatibility hazard. The linker will
 # generate load commands differently based on what minimum OS it can assume.

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 ifeq ($(strip $(shell uname -m)),arm64)
 	GREP_PATTERN = "minos 11.0"
--- a/tests/run-make/macos-fat-archive/Makefile
+++ b/tests/run-make/macos-fat-archive/Makefile
@ -1,6 +1,6 @@
 # only-macos

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 "$(TMPDIR)"/libnative-library.a: native-library.c
 	$(CC) -arch arm64 -arch x86_64 native-library.c -c -o "$(TMPDIR)"/native-library.o
--- a/tests/run-make/native-link-modifier-bundle/Makefile
+++ b/tests/run-make/native-link-modifier-bundle/Makefile
@ -1,7 +1,7 @@
 # ignore-cross-compile
 # ignore-windows-msvc

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # We're using the llvm-nm instead of the system nm to ensure it is compatible
 # with the LLVM bitcode generated by rustc.
--- a/tests/run-make/native-link-modifier-verbatim-linker/Makefile
+++ b/tests/run-make/native-link-modifier-verbatim-linker/Makefile
@ -1,7 +1,7 @@
 # ignore-cross-compile
 # ignore-macos

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	# Verbatim allows specify precise name.
--- a/tests/run-make/native-link-modifier-verbatim-rustc/Makefile
+++ b/tests/run-make/native-link-modifier-verbatim-rustc/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	# Verbatim allows specify precise name.
--- a/tests/run-make/native-link-modifier-whole-archive/Makefile
+++ b/tests/run-make/native-link-modifier-whole-archive/Makefile
@ -8,7 +8,7 @@
 # that code would never make it into the final executable and we'd thus be missing some
 # of the output.

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all: $(TMPDIR)/$(call BIN,directly_linked) \
     $(TMPDIR)/$(call BIN,directly_linked_test_plus_whole_archive) \
--- a/tests/run-make/no-input-file/Makefile
+++ b/tests/run-make/no-input-file/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) --print crate-name 2>&1 | diff - no-input-file.stderr
--- a/tests/run-make/overwrite-input/Makefile
+++ b/tests/run-make/overwrite-input/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) main.rs -o main.rs 2> $(TMPDIR)/file.stderr || echo "failed successfully"
--- a/tests/run-make/panic-impl-transitive/Makefile
+++ b/tests/run-make/panic-impl-transitive/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # NOTE we use --emit=llvm-ir to avoid running the linker (linking will fail because there's no main
 # in this crate)
--- a/tests/run-make/pass-linker-flags-from-dep/Makefile
+++ b/tests/run-make/pass-linker-flags-from-dep/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	# Build deps
--- a/tests/run-make/pass-linker-flags/Makefile
+++ b/tests/run-make/pass-linker-flags/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) rs.rs -Z unstable-options -l static=l1 -l link-arg=a1 -l static=l2 -l link-arg=a2 -l dylib=d1 -l link-arg=a3 --print link-args | $(CGREP) -e 'l1.*a1.*l2.*a2.*d1.*a3'
--- a/tests/run-make/print-calling-conventions/Makefile
+++ b/tests/run-make/print-calling-conventions/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) --print calling-conventions
--- a/tests/run-make/raw-dylib-alt-calling-convention/Makefile
+++ b/tests/run-make/raw-dylib-alt-calling-convention/Makefile
@ -3,7 +3,7 @@
 # only-x86
 # only-windows

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) --crate-type lib --crate-name raw_dylib_alt_calling_convention_test lib.rs
--- a/tests/run-make/raw-dylib-c/Makefile
+++ b/tests/run-make/raw-dylib-c/Makefile
@ -2,7 +2,7 @@

 # only-windows

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs
--- a/tests/run-make/raw-dylib-cross-compilation/Makefile
+++ b/tests/run-make/raw-dylib-cross-compilation/Makefile
@ -7,7 +7,7 @@
 # i686 dlltool.exe can't product x64 binaries.
 # ignore-i686-pc-windows-gnu

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	# Build as x86 and make sure that we have x86 objects only.
--- a/tests/run-make/raw-dylib-import-name-type/Makefile
+++ b/tests/run-make/raw-dylib-import-name-type/Makefile
@ -3,7 +3,7 @@
 # only-x86
 # only-windows

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)"
--- a/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
+++ b/tests/run-make/raw-dylib-inline-cross-dylib/Makefile
@ -2,7 +2,7 @@

 # only-windows

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # We'd be using the llvm-objdump instead of the system objdump to ensure compatibility
 # with the LLVM bitcode generated by rustc but on Windows  piping/IO redirection under MSYS2 is wonky with llvm-objdump.
--- a/tests/run-make/raw-dylib-link-ordinal/Makefile
+++ b/tests/run-make/raw-dylib-link-ordinal/Makefile
@ -2,7 +2,7 @@

 # only-windows

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs
--- a/tests/run-make/raw-dylib-stdcall-ordinal/Makefile
+++ b/tests/run-make/raw-dylib-stdcall-ordinal/Makefile
@ -3,7 +3,7 @@
 # only-x86
 # only-windows

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs
--- a/tests/run-make/remap-path-prefix-dwarf/Makefile
+++ b/tests/run-make/remap-path-prefix-dwarf/Makefile
@ -6,7 +6,7 @@
 SRC_DIR := $(abspath .)
 SRC_DIR_PARENT := $(abspath ..)

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all: \
  abs_input_outside_working_dir \
--- a/tests/run-make/repr128-dwarf/Makefile
+++ b/tests/run-make/repr128-dwarf/Makefile
@ -2,7 +2,7 @@
 # This test should be replaced with one in tests/debuginfo once GDB or LLDB support 128-bit
 # enums.

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) -Cdebuginfo=2 lib.rs -o $(TMPDIR)/repr128.rlib
--- a/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs-2/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # ignore-cross-compile

--- a/tests/run-make/rlib-format-packed-bundled-libs-3/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs-3/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # ignore-cross-compile
 # only-linux
--- a/tests/run-make/rlib-format-packed-bundled-libs/Makefile
+++ b/tests/run-make/rlib-format-packed-bundled-libs/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # ignore-cross-compile

--- a/tests/run-make/rustc-macro-dep-files/Makefile
+++ b/tests/run-make/rustc-macro-dep-files/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC`
 # instead of hardcoding them everywhere they're needed.
--- a/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk
+++ b/tests/run-make/rustdoc-scrape-examples-multiple/scrape.mk
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 OUTPUT_DIR := "$(TMPDIR)/rustdoc"

--- a/tests/run-make/rustdoc-verify-output-files/Makefile
+++ b/tests/run-make/rustdoc-verify-output-files/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 OUTPUT_DIR := "$(TMPDIR)/rustdoc"
 TMP_OUTPUT_DIR := "$(TMPDIR)/tmp-rustdoc"
--- a/tests/run-make/rustdoc-with-out-dir-option/Makefile
+++ b/tests/run-make/rustdoc-with-out-dir-option/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 OUTPUT_DIR := "$(TMPDIR)/rustdoc"

--- a/tests/run-make/rustdoc-with-output-option/Makefile
+++ b/tests/run-make/rustdoc-with-output-option/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 OUTPUT_DIR := "$(TMPDIR)/rustdoc"

--- a/tests/run-make/rustdoc-with-short-out-dir-option/Makefile
+++ b/tests/run-make/rustdoc-with-short-out-dir-option/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 OUTPUT_DIR := "$(TMPDIR)/rustdoc"

--- a/tests/run-make/share-generics-dylib/Makefile
+++ b/tests/run-make/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 ../tools.mk

 COMMON_ARGS=-Cprefer-dynamic -Zshare-generics=yes -Ccodegen-units=1 -Csymbol-mangling-version=v0

--- a/tests/run-make/static-pie/Makefile
+++ b/tests/run-make/static-pie/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-x86_64
 # only-linux
--- a/tests/run-make/test-benches/Makefile
+++ b/tests/run-make/test-benches/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # ignore-cross-compile

--- a/tests/run-make/thumb-none-cortex-m/Makefile
+++ b/tests/run-make/thumb-none-cortex-m/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # How to run this
 # $ ./x.py clean
--- a/tests/run-make/thumb-none-qemu/Makefile
+++ b/tests/run-make/thumb-none-qemu/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-thumb

--- a/tests/run-make-fulldeps/tools.mk
+++ b/tests/run-make-fulldeps/tools.mk
--- a/tests/run-make/track-path-dep-info/Makefile
+++ b/tests/run-make/track-path-dep-info/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC`
 # instead of hardcoding them everywhere they're needed.
--- a/tests/run-make/track-pgo-dep-info/Makefile
+++ b/tests/run-make/track-pgo-dep-info/Makefile
@ -1,7 +1,7 @@
 # needs-profiler-support
 # ignore-windows-gnu

-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC`
 # instead of hardcoding them everywhere they're needed.
--- a/tests/run-make/translation/Makefile
+++ b/tests/run-make/translation/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # This test uses `ln -s` rather than copying to save testing time, but its
 # usage doesn't work on Windows.
--- a/tests/run-make/unstable-flag-required/Makefile
+++ b/tests/run-make/unstable-flag-required/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTDOC) --output-format=json x.html 2>&1 | diff - output-format-json.stderr
--- a/tests/run-make/valid-print-requests/Makefile
+++ b/tests/run-make/valid-print-requests/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 all:
 	$(RUSTC) --print uwu 2>&1 | diff - valid-print-requests.stderr
--- a/tests/run-make/wasm-abi/Makefile
+++ b/tests/run-make/wasm-abi/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-wasm32-bare

--- a/tests/run-make/wasm-custom-section/Makefile
+++ b/tests/run-make/wasm-custom-section/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-wasm32-bare

--- a/tests/run-make/wasm-custom-sections-opt/Makefile
+++ b/tests/run-make/wasm-custom-sections-opt/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-wasm32-bare

--- a/tests/run-make/wasm-export-all-symbols/Makefile
+++ b/tests/run-make/wasm-export-all-symbols/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-wasm32-bare

--- a/tests/run-make/wasm-import-module/Makefile
+++ b/tests/run-make/wasm-import-module/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-wasm32-bare

--- a/tests/run-make/wasm-panic-small/Makefile
+++ b/tests/run-make/wasm-panic-small/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-wasm32-bare

--- a/tests/run-make/wasm-spurious-import/Makefile
+++ b/tests/run-make/wasm-spurious-import/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-wasm32-bare

--- a/tests/run-make/wasm-stringify-ints-small/Makefile
+++ b/tests/run-make/wasm-stringify-ints-small/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 ifeq ($(TARGET),wasm32-unknown-unknown)
 all:
--- a/tests/run-make/wasm-symbols-different-module/Makefile
+++ b/tests/run-make/wasm-symbols-different-module/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-wasm32-bare

--- a/tests/run-make/wasm-symbols-not-exported/Makefile
+++ b/tests/run-make/wasm-symbols-not-exported/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-wasm32-bare

--- a/tests/run-make/wasm-symbols-not-imported/Makefile
+++ b/tests/run-make/wasm-symbols-not-imported/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 # only-wasm32-bare

--- a/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile
+++ b/tests/run-make/x86_64-fortanix-unknown-sgx-lvi/Makefile
@ -1,4 +1,4 @@
-include ../../run-make-fulldeps/tools.mk
+include ../tools.mk

 #only-x86_64-fortanix-unknown-sgx