Skip to content

Commit b46f615

Browse files
committed
Move rustdoc run-make-fulldeps tests to run-make
This cuts the time to run the tests in half, because they don't require building a stage 2 compiler. This doesn't change coverage tests, which will be changed soon in a separate PR.
1 parent a5029ac commit b46f615

File tree

27 files changed

+7
-13
lines changed

27 files changed

+7
-13
lines changed

src/test/run-make-fulldeps/exit-code/Makefile renamed to src/test/run-make/exit-code/Makefile

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

33
all:
44
$(RUSTC) success.rs; [ $$? -eq 0 ]

src/test/run-make-fulldeps/issue-22131/Makefile renamed to src/test/run-make/issue-22131/Makefile

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

33
all: foo.rs
44
$(RUSTC) --cfg 'feature="bar"' --crate-type lib foo.rs

src/test/run-make-fulldeps/issue-38237/Makefile renamed to src/test/run-make/issue-38237/Makefile

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

33
all:
44
$(RUSTC) foo.rs; $(RUSTC) bar.rs

src/test/run-make-fulldeps/rustdoc-determinism/Makefile renamed to src/test/run-make/rustdoc-determinism/Makefile

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

33
# Assert that the search index is generated deterministically, regardless of the
44
# order that crates are documented in.

src/test/run-make-fulldeps/rustdoc-error-lines/Makefile renamed to src/test/run-make/rustdoc-error-lines/Makefile

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

33
# Test that hir-tree output doesn't crash and includes
44
# the string constant we would expect to see.

src/test/run-make-fulldeps/rustdoc-io-error/Makefile renamed to src/test/run-make/rustdoc-io-error/Makefile

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

33
# This test verifies that rustdoc doesn't ICE when it encounters an IO error
44
# while generating files. Ideally this would be a rustdoc-ui test, so we could
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
-include ../tools.mk
2-
31
all:
42
$(RUSTDOC) -Z unstable-options --generate-redirect-map foo.rs -o "$(TMPDIR)/out"
53
"$(PYTHON)" validate_json.py "$(TMPDIR)/out"
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
-include ../tools.mk
2-
31
all:
42
$(RUSTDOC) -o "$(TMPDIR)/foo/bar/doc" foo.rs
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
-include ../tools.mk
2-
31
all:
42
$(RUSTDOC) -Z unstable-options --print unversioned-files | sort | diff - unversioned-files.txt

src/test/run-make-fulldeps/rustdoc-themes/Makefile renamed to src/test/run-make/rustdoc-themes/Makefile

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

33
# Test that rustdoc will properly load in a theme file and display it in the theme selector.
44

0 commit comments

Comments
 (0)