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

Commit 3328913

Browse files
borsbors
committed
Auto merge of rust-lang#109770 - jyn514:run-make-fulldeps, r=Mark-Simulacrum
Move almost all run-make-fulldeps tests to run-make They pass fine, and this avoids having to build the compiler twice. There are few enough tests left that I think it should be possible to get rid of this test suite altogether, but I expect this PR to fail at least a few times in bors and want to get it merged before tackling further changes. cc rust-lang#83775 Fixes rust-lang#66085. Fixes rust-lang#83773.
2 parents a93bcdc + c45037b commit 3328913

File tree

774 files changed

+226
-95
lines changed

Some content is hidden

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

774 files changed

+226
-95
lines changed

‎tests/run-make-fulldeps/hotplug_codegen_backend/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
# ignore-stage1
44

‎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/issue-25581/Makefile

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎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.

‎tests/run-make-fulldeps/pretty-expanded/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
all:
44
$(RUSTC) -o $(TMPDIR)/input.expanded.rs -Zunpretty=expanded input.rs

‎tests/run-make-fulldeps/a-b-a-linker-guard/Makefile renamed to ‎tests/run-make/a-b-a-linker-guard/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# ignore-cross-compile
12
include ../tools.mk
23

34
# Test that if we build `b` against a version of `a` that has one set

‎tests/run-make-fulldeps/a-b-a-linker-guard/a.rs renamed to ‎tests/run-make/a-b-a-linker-guard/a.rs

File renamed without changes.

‎tests/run-make-fulldeps/a-b-a-linker-guard/b.rs renamed to ‎tests/run-make/a-b-a-linker-guard/b.rs

File renamed without changes.

‎tests/run-make-fulldeps/alloc-no-oom-handling/Makefile renamed to ‎tests/run-make/alloc-no-oom-handling/Makefile

File renamed without changes.

‎tests/run-make-fulldeps/alloc-no-rc/Makefile renamed to ‎tests/run-make/alloc-no-rc/Makefile

File renamed without changes.

0 commit comments

Comments
 (0)