Skip to content

Commit 26e1ce7

Browse files
jyn514jyn514
committed
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)
1 parent 06b2d4b commit 26e1ce7

File tree

89 files changed

+88
-88
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+88
-88
lines changed

‎tests/run-make-fulldeps/issue-19371/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../tools.mk
1+
include ../../run-make/tools.mk
22

33
# This test ensures that rustc compile_input can be called twice in one task
44
# without causing a panic.

‎tests/run-make-fulldeps/obtain-borrowck/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../tools.mk
1+
include ../../run-make/tools.mk
22

33
# This example shows how to implement a rustc driver that retrieves MIR bodies
44
# together with the borrow checker information.

‎tests/run-make-fulldeps/pretty-expanded/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../tools.mk
1+
include ../../run-make/tools.mk
22

33
all:
44
$(RUSTC) -o $(TMPDIR)/input.expanded.rs -Zunpretty=expanded input.rs

‎tests/run-make/const_fn_mir/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
all:
44
$(RUSTC) main.rs --emit=mir -o "$(TMPDIR)"/dump.mir

‎tests/run-make/coverage/coverage_tools.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
#
44
# include ../coverage/coverage_tools.mk
55

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

‎tests/run-make/crate-hash-rustc-version/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# Ensure that crates compiled with different rustc versions cannot
44
# be dynamically linked.

‎tests/run-make/dep-graph/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# ignore-cross-compile
44

‎tests/run-make/doctests-keep-binaries/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

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

‎tests/run-make/dump-mono-stats/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
all:
44
$(RUSTC) --crate-type lib foo.rs -Z dump-mono-stats=$(TMPDIR) -Zdump-mono-stats-format=json

‎tests/run-make/emit-named-files/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
OUT=$(TMPDIR)/emit
44

‎tests/run-make/emit-path-unhashed/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
OUT=$(TMPDIR)/emit
44

‎tests/run-make/emit-shared-files/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
INVOCATION_ONLY = $(TMPDIR)/invocation-only
44
TOOLCHAIN_ONLY = $(TMPDIR)/toolchain-only

‎tests/run-make/env-dep-info/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# FIXME(eddyb) provide `HOST_RUSTC` and `TARGET_RUSTC`
44
# instead of hardcoding them everywhere they're needed.

‎tests/run-make/export-executable-symbols/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# ignore-wasm32
44
# ignore-wasm64

‎tests/run-make/fmt-write-bloat/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# ignore-windows
44

‎tests/run-make/incr-foreign-head-span/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# ignore-none no-std is not supported
44
# ignore-nvptx64-nvidia-cuda FIXME: can't find crate for 'std'

‎tests/run-make/incr-prev-body-beyond-eof/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ignore-none no-std is not supported
22
# ignore-nvptx64-nvidia-cuda FIXME: can't find crate for `std`
33

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

66
# Tests that we don't ICE during incremental compilation after modifying a
77
# function span such that its previous end line exceeds the number of lines

‎tests/run-make/incremental-session-fail/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
SESSION_DIR := $(TMPDIR)/session
44
OUTPUT_FILE := $(TMPDIR)/build-output

‎tests/run-make/invalid-so/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

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

‎tests/run-make/issue-10971-temps-dir/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# Regression test for issue #10971
44
# Running two invocations in parallel would overwrite each other's temp files.

‎tests/run-make/issue-36710/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# (see dist-i586-gnu-i586-i686-musl Dockerfile)
77
# ignore-sgx
88

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

1111
all: foo
1212
$(call RUN,foo)

‎tests/run-make/issue-47384/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# only-linux
44
# ignore-cross-compile

‎tests/run-make/issue-71519/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# ignore-msvc
44
# needs-rust-lld

‎tests/run-make/issue-83045/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# This test case creates a situation where the crate loader would run
44
# into an ICE when confronted with an invalid setup where it cannot

‎tests/run-make/issue-83112-incr-test-moved-file/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# ignore-none no-std is not supported
44
# ignore-nvptx64-nvidia-cuda FIXME: can't find crate for 'std'

‎tests/run-make/issue-84395-lto-embed-bitcode/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# This test makes sure the embed bitcode in elf created with
44
# lto-embed-bitcode=optimized is valid llvm BC module.
55

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

88
all:
99
$(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

‎tests/run-make/issue-85019-moved-src-dir/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
INCR=$(TMPDIR)/incr
44
FIRST_SRC=$(TMPDIR)/first_src

‎tests/run-make/issue-85401-static-mir/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# Regression test for issue #85401
44
# Verify that we do not ICE when trying to access MIR for statics,

‎tests/run-make/issue-85441/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# only-windows-msvc
22

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

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

‎tests/run-make/issue-88756-default-output/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
all:
44
$(BARE_RUSTDOC) 2>&1 | sed -E 's@/nightly/|/beta/|/stable/|/1\.[0-9]+\.[0-9]+/@/$$CHANNEL/@g' | diff - output-default.stdout

‎tests/run-make/issue-96498/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# only-windows
22
# needs-rust-lld
33

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

66
# Ensure that LLD can link
77
all:

‎tests/run-make/issue-97463-abi-param-passing/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# ignore-msvc
44

‎tests/run-make/issue64319/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# Different optimization levels imply different values for `-Zshare-generics`,
44
# so try out a whole bunch of combinations to make sure everything is compatible

‎tests/run-make/jobserver-error/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# only-linux
44

‎tests/run-make/libtest-thread-limit/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# only-linux
44

‎tests/run-make/llvm-outputs/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
all:
44
echo 'fn main() {}' | $(BARE_RUSTC) - --out-dir=$(TMPDIR)/random_directory_that_does_not_exist_ir/ --emit=llvm-ir

‎tests/run-make/macos-deployment-target/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# This is important since its a compatibility hazard. The linker will
55
# generate load commands differently based on what minimum OS it can assume.
66

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

99
ifeq ($(strip $(shell uname -m)),arm64)
1010
GREP_PATTERN = "minos 11.0"

‎tests/run-make/macos-fat-archive/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# only-macos
22

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

55
"$(TMPDIR)"/libnative-library.a: native-library.c
66
$(CC) -arch arm64 -arch x86_64 native-library.c -c -o "$(TMPDIR)"/native-library.o

‎tests/run-make/native-link-modifier-bundle/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ignore-cross-compile
22
# ignore-windows-msvc
33

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

66
# We're using the llvm-nm instead of the system nm to ensure it is compatible
77
# with the LLVM bitcode generated by rustc.

‎tests/run-make/native-link-modifier-verbatim-linker/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# ignore-cross-compile
22
# ignore-macos
33

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

66
all:
77
# Verbatim allows specify precise name.

‎tests/run-make/native-link-modifier-verbatim-rustc/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
all:
44
# Verbatim allows specify precise name.

‎tests/run-make/native-link-modifier-whole-archive/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# that code would never make it into the final executable and we'd thus be missing some
99
# of the output.
1010

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

1313
all: $(TMPDIR)/$(call BIN,directly_linked) \
1414
$(TMPDIR)/$(call BIN,directly_linked_test_plus_whole_archive) \

‎tests/run-make/no-input-file/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
all:
44
$(RUSTC) --print crate-name 2>&1 | diff - no-input-file.stderr

‎tests/run-make/overwrite-input/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
all:
44
$(RUSTC) main.rs -o main.rs 2> $(TMPDIR)/file.stderr || echo "failed successfully"

‎tests/run-make/panic-impl-transitive/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
# NOTE we use --emit=llvm-ir to avoid running the linker (linking will fail because there's no main
44
# in this crate)

‎tests/run-make/pass-linker-flags-from-dep/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
all:
44
# Build deps

‎tests/run-make/pass-linker-flags/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
all:
44
$(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'

‎tests/run-make/print-calling-conventions/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include ../../run-make-fulldeps/tools.mk
1+
include ../tools.mk
22

33
all:
44
$(RUSTC) --print calling-conventions

‎tests/run-make/raw-dylib-alt-calling-convention/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# only-x86
44
# only-windows
55

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

88
all:
99
$(RUSTC) --crate-type lib --crate-name raw_dylib_alt_calling_convention_test lib.rs

‎tests/run-make/raw-dylib-c/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# only-windows
44

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

77
all:
88
$(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs

‎tests/run-make/raw-dylib-cross-compilation/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# i686 dlltool.exe can't product x64 binaries.
88
# ignore-i686-pc-windows-gnu
99

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

1212
all:
1313
# Build as x86 and make sure that we have x86 objects only.

‎tests/run-make/raw-dylib-import-name-type/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# only-x86
44
# only-windows
55

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

88
all:
99
$(RUSTC) --crate-type bin driver.rs -L "$(TMPDIR)"

‎tests/run-make/raw-dylib-inline-cross-dylib/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# only-windows
44

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

77
# We'd be using the llvm-objdump instead of the system objdump to ensure compatibility
88
# with the LLVM bitcode generated by rustc but on Windows piping/IO redirection under MSYS2 is wonky with llvm-objdump.

‎tests/run-make/raw-dylib-link-ordinal/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# only-windows
44

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

77
all:
88
$(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs

‎tests/run-make/raw-dylib-stdcall-ordinal/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# only-x86
44
# only-windows
55

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

88
all:
99
$(RUSTC) --crate-type lib --crate-name raw_dylib_test lib.rs

‎tests/run-make/remap-path-prefix-dwarf/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
SRC_DIR := $(abspath .)
77
SRC_DIR_PARENT := $(abspath ..)
88

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

1111
all: \
1212
abs_input_outside_working_dir \

‎tests/run-make/repr128-dwarf/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# This test should be replaced with one in tests/debuginfo once GDB or LLDB support 128-bit
33
# enums.
44

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

77
all:
88
$(RUSTC) -Cdebuginfo=2 lib.rs -o $(TMPDIR)/repr128.rlib

0 commit comments

Comments
 (0)