Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 26e1ce7

Browse files
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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.
Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

0 commit comments

Comments
 (0)