Rollup merge of rust-lang#83775 - jyn514:run-make, r=petrochenkov

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. They were all added to fulldeps before rust-lang#82802 because rustdoc wasn't available in run-make tests. This doesn't change coverage tests, which will be changed soon in a separate PR (rust-lang#83755 (comment)). This also changes some of the `-include` directives, see rust-lang#83773 for what's going on there. r? `@petrochenkov`
Dylan-DPC-zz · Apr 2, 2021 · cfe69ad · cfe69ad
2 parents 4410fdf + b46f615
commit cfe69ad
Show file tree

Hide file tree

Showing 27 changed files with 7 additions and 13 deletions.
diff --git a/...test/run-make-fulldeps/exit-code/Makefile → src/test/run-make/exit-code/Makefile b/...test/run-make-fulldeps/exit-code/Makefile → src/test/run-make/exit-code/Makefile
@@ -1,4 +1,4 @@
--include ../tools.mk
+include ../../run-make-fulldeps/tools.mk
 
 all:
 	$(RUSTC) success.rs; [ $$? -eq 0 ]

diff --git a/...-make-fulldeps/exit-code/compile-error.rs → src/test/run-make/exit-code/compile-error.rs b/...-make-fulldeps/exit-code/compile-error.rs → src/test/run-make/exit-code/compile-error.rs
diff --git a/...n-make-fulldeps/exit-code/lint-failure.rs → src/test/run-make/exit-code/lint-failure.rs b/...n-make-fulldeps/exit-code/lint-failure.rs → src/test/run-make/exit-code/lint-failure.rs
diff --git a/...st/run-make-fulldeps/exit-code/success.rs → src/test/run-make/exit-code/success.rs b/...st/run-make-fulldeps/exit-code/success.rs → src/test/run-make/exit-code/success.rs
diff --git a/...st/run-make-fulldeps/issue-22131/Makefile → src/test/run-make/issue-22131/Makefile b/...st/run-make-fulldeps/issue-22131/Makefile → src/test/run-make/issue-22131/Makefile
@@ -1,4 +1,4 @@
--include ../tools.mk
+include ../../run-make-fulldeps/tools.mk
 
 all: foo.rs
 	$(RUSTC) --cfg 'feature="bar"' --crate-type lib foo.rs

diff --git a/...test/run-make-fulldeps/issue-22131/foo.rs → src/test/run-make/issue-22131/foo.rs b/...test/run-make-fulldeps/issue-22131/foo.rs → src/test/run-make/issue-22131/foo.rs
diff --git a/...st/run-make-fulldeps/issue-38237/Makefile → src/test/run-make/issue-38237/Makefile b/...st/run-make-fulldeps/issue-38237/Makefile → src/test/run-make/issue-38237/Makefile
@@ -1,4 +1,4 @@
--include ../tools.mk
+include ../../run-make-fulldeps/tools.mk
 
 all:
 	$(RUSTC) foo.rs; $(RUSTC) bar.rs

diff --git a/...test/run-make-fulldeps/issue-38237/bar.rs → src/test/run-make/issue-38237/bar.rs b/...test/run-make-fulldeps/issue-38237/bar.rs → src/test/run-make/issue-38237/bar.rs
diff --git a/...test/run-make-fulldeps/issue-38237/baz.rs → src/test/run-make/issue-38237/baz.rs b/...test/run-make-fulldeps/issue-38237/baz.rs → src/test/run-make/issue-38237/baz.rs
diff --git a/...test/run-make-fulldeps/issue-38237/foo.rs → src/test/run-make/issue-38237/foo.rs b/...test/run-make-fulldeps/issue-38237/foo.rs → src/test/run-make/issue-38237/foo.rs
diff --git a/...ake-fulldeps/rustdoc-determinism/Makefile → ...est/run-make/rustdoc-determinism/Makefile b/...ake-fulldeps/rustdoc-determinism/Makefile → ...est/run-make/rustdoc-determinism/Makefile
@@ -1,4 +1,4 @@
--include ../tools.mk
+include ../../run-make-fulldeps/tools.mk
 
 # Assert that the search index is generated deterministically, regardless of the
 # order that crates are documented in.

diff --git a/...-make-fulldeps/rustdoc-determinism/bar.rs → src/test/run-make/rustdoc-determinism/bar.rs b/...-make-fulldeps/rustdoc-determinism/bar.rs → src/test/run-make/rustdoc-determinism/bar.rs
diff --git a/...-make-fulldeps/rustdoc-determinism/foo.rs → src/test/run-make/rustdoc-determinism/foo.rs b/...-make-fulldeps/rustdoc-determinism/foo.rs → src/test/run-make/rustdoc-determinism/foo.rs
diff --git a/...ake-fulldeps/rustdoc-error-lines/Makefile → ...est/run-make/rustdoc-error-lines/Makefile b/...ake-fulldeps/rustdoc-error-lines/Makefile → ...est/run-make/rustdoc-error-lines/Makefile
@@ -1,4 +1,4 @@
--include ../tools.mk
+include ../../run-make-fulldeps/tools.mk
 
 # Test that hir-tree output doesn't crash and includes
 # the string constant we would expect to see.

diff --git a/...ake-fulldeps/rustdoc-error-lines/input.rs → ...est/run-make/rustdoc-error-lines/input.rs b/...ake-fulldeps/rustdoc-error-lines/input.rs → ...est/run-make/rustdoc-error-lines/input.rs
diff --git a/...n-make-fulldeps/rustdoc-io-error/Makefile → src/test/run-make/rustdoc-io-error/Makefile b/...n-make-fulldeps/rustdoc-io-error/Makefile → src/test/run-make/rustdoc-io-error/Makefile
@@ -1,4 +1,4 @@
--include ../tools.mk
+include ../../run-make-fulldeps/tools.mk
 
 # This test verifies that rustdoc doesn't ICE when it encounters an IO error
 # while generating files. Ideally this would be a rustdoc-ui test, so we could

diff --git a/...run-make-fulldeps/rustdoc-io-error/foo.rs → src/test/run-make/rustdoc-io-error/foo.rs b/...run-make-fulldeps/rustdoc-io-error/foo.rs → src/test/run-make/rustdoc-io-error/foo.rs
diff --git a/...n-make-fulldeps/rustdoc-map-file/Makefile → src/test/run-make/rustdoc-map-file/Makefile b/...n-make-fulldeps/rustdoc-map-file/Makefile → src/test/run-make/rustdoc-map-file/Makefile
@@ -1,5 +1,3 @@
--include ../tools.mk
-
 all:
 	$(RUSTDOC) -Z unstable-options --generate-redirect-map foo.rs -o "$(TMPDIR)/out"
 	"$(PYTHON)" validate_json.py "$(TMPDIR)/out"
diff --git a/...e-fulldeps/rustdoc-map-file/expected.json → ...t/run-make/rustdoc-map-file/expected.json b/...e-fulldeps/rustdoc-map-file/expected.json → ...t/run-make/rustdoc-map-file/expected.json
diff --git a/...run-make-fulldeps/rustdoc-map-file/foo.rs → src/test/run-make/rustdoc-map-file/foo.rs b/...run-make-fulldeps/rustdoc-map-file/foo.rs → src/test/run-make/rustdoc-map-file/foo.rs
diff --git a/...ulldeps/rustdoc-map-file/validate_json.py → ...un-make/rustdoc-map-file/validate_json.py b/...ulldeps/rustdoc-map-file/validate_json.py → ...un-make/rustdoc-map-file/validate_json.py
diff --git a/...ake-fulldeps/rustdoc-output-path/Makefile → ...est/run-make/rustdoc-output-path/Makefile b/...ake-fulldeps/rustdoc-output-path/Makefile → ...est/run-make/rustdoc-output-path/Makefile
@@ -1,4 +1,2 @@
--include ../tools.mk
-
 all:
 	$(RUSTDOC) -o "$(TMPDIR)/foo/bar/doc" foo.rs
diff --git a/...-make-fulldeps/rustdoc-output-path/foo.rs → src/test/run-make/rustdoc-output-path/foo.rs b/...-make-fulldeps/rustdoc-output-path/foo.rs → src/test/run-make/rustdoc-output-path/foo.rs
diff --git a/...fulldeps/print-unversioned-files/Makefile → .../rustdoc-print-unversioned-files/Makefile b/...fulldeps/print-unversioned-files/Makefile → .../rustdoc-print-unversioned-files/Makefile
@@ -1,4 +1,2 @@
--include ../tools.mk
-
 all:
 	$(RUSTDOC) -Z unstable-options --print unversioned-files | sort | diff - unversioned-files.txt
diff --git a/...t-unversioned-files/unversioned-files.txt → ...t-unversioned-files/unversioned-files.txt b/...t-unversioned-files/unversioned-files.txt → ...t-unversioned-files/unversioned-files.txt
diff --git a/...run-make-fulldeps/rustdoc-themes/Makefile → src/test/run-make/rustdoc-themes/Makefile b/...run-make-fulldeps/rustdoc-themes/Makefile → src/test/run-make/rustdoc-themes/Makefile
@@ -1,4 +1,4 @@
--include ../tools.mk
+include ../../run-make-fulldeps/tools.mk
 
 # Test that rustdoc will properly load in a theme file and display it in the theme selector.
 

diff --git a/...t/run-make-fulldeps/rustdoc-themes/foo.rs → src/test/run-make/rustdoc-themes/foo.rs b/...t/run-make-fulldeps/rustdoc-themes/foo.rs → src/test/run-make/rustdoc-themes/foo.rs