From b46f61590c86ed7be400176c932c0f892d44e151 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Fri, 2 Apr 2021 03:25:29 -0400 Subject: [PATCH] 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. --- src/test/{run-make-fulldeps => run-make}/exit-code/Makefile | 2 +- .../{run-make-fulldeps => run-make}/exit-code/compile-error.rs | 0 .../{run-make-fulldeps => run-make}/exit-code/lint-failure.rs | 0 src/test/{run-make-fulldeps => run-make}/exit-code/success.rs | 0 src/test/{run-make-fulldeps => run-make}/issue-22131/Makefile | 2 +- src/test/{run-make-fulldeps => run-make}/issue-22131/foo.rs | 0 src/test/{run-make-fulldeps => run-make}/issue-38237/Makefile | 2 +- src/test/{run-make-fulldeps => run-make}/issue-38237/bar.rs | 0 src/test/{run-make-fulldeps => run-make}/issue-38237/baz.rs | 0 src/test/{run-make-fulldeps => run-make}/issue-38237/foo.rs | 0 .../rustdoc-determinism/Makefile | 2 +- .../{run-make-fulldeps => run-make}/rustdoc-determinism/bar.rs | 0 .../{run-make-fulldeps => run-make}/rustdoc-determinism/foo.rs | 0 .../rustdoc-error-lines/Makefile | 2 +- .../rustdoc-error-lines/input.rs | 0 .../{run-make-fulldeps => run-make}/rustdoc-io-error/Makefile | 2 +- .../{run-make-fulldeps => run-make}/rustdoc-io-error/foo.rs | 0 .../{run-make-fulldeps => run-make}/rustdoc-map-file/Makefile | 2 -- .../rustdoc-map-file/expected.json | 0 .../{run-make-fulldeps => run-make}/rustdoc-map-file/foo.rs | 0 .../rustdoc-map-file/validate_json.py | 0 .../rustdoc-output-path/Makefile | 2 -- .../{run-make-fulldeps => run-make}/rustdoc-output-path/foo.rs | 0 .../rustdoc-print-unversioned-files}/Makefile | 2 -- .../rustdoc-print-unversioned-files}/unversioned-files.txt | 0 .../{run-make-fulldeps => run-make}/rustdoc-themes/Makefile | 2 +- src/test/{run-make-fulldeps => run-make}/rustdoc-themes/foo.rs | 0 27 files changed, 7 insertions(+), 13 deletions(-) rename src/test/{run-make-fulldeps => run-make}/exit-code/Makefile (90%) rename src/test/{run-make-fulldeps => run-make}/exit-code/compile-error.rs (100%) rename src/test/{run-make-fulldeps => run-make}/exit-code/lint-failure.rs (100%) rename src/test/{run-make-fulldeps => run-make}/exit-code/success.rs (100%) rename src/test/{run-make-fulldeps => run-make}/issue-22131/Makefile (81%) rename src/test/{run-make-fulldeps => run-make}/issue-22131/foo.rs (100%) rename src/test/{run-make-fulldeps => run-make}/issue-38237/Makefile (67%) rename src/test/{run-make-fulldeps => run-make}/issue-38237/bar.rs (100%) rename src/test/{run-make-fulldeps => run-make}/issue-38237/baz.rs (100%) rename src/test/{run-make-fulldeps => run-make}/issue-38237/foo.rs (100%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-determinism/Makefile (90%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-determinism/bar.rs (100%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-determinism/foo.rs (100%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-error-lines/Makefile (91%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-error-lines/input.rs (100%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-io-error/Makefile (94%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-io-error/foo.rs (100%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-map-file/Makefile (85%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-map-file/expected.json (100%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-map-file/foo.rs (100%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-map-file/validate_json.py (100%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-output-path/Makefile (69%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-output-path/foo.rs (100%) rename src/test/{run-make-fulldeps/print-unversioned-files => run-make/rustdoc-print-unversioned-files}/Makefile (82%) rename src/test/{run-make-fulldeps/print-unversioned-files => run-make/rustdoc-print-unversioned-files}/unversioned-files.txt (100%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-themes/Makefile (88%) rename src/test/{run-make-fulldeps => run-make}/rustdoc-themes/foo.rs (100%) diff --git a/src/test/run-make-fulldeps/exit-code/Makefile b/src/test/run-make/exit-code/Makefile similarity index 90% rename from src/test/run-make-fulldeps/exit-code/Makefile rename to src/test/run-make/exit-code/Makefile index 007f19852a662..663034e2e7da0 100644 --- a/src/test/run-make-fulldeps/exit-code/Makefile +++ b/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/src/test/run-make-fulldeps/exit-code/compile-error.rs b/src/test/run-make/exit-code/compile-error.rs similarity index 100% rename from src/test/run-make-fulldeps/exit-code/compile-error.rs rename to src/test/run-make/exit-code/compile-error.rs diff --git a/src/test/run-make-fulldeps/exit-code/lint-failure.rs b/src/test/run-make/exit-code/lint-failure.rs similarity index 100% rename from src/test/run-make-fulldeps/exit-code/lint-failure.rs rename to src/test/run-make/exit-code/lint-failure.rs diff --git a/src/test/run-make-fulldeps/exit-code/success.rs b/src/test/run-make/exit-code/success.rs similarity index 100% rename from src/test/run-make-fulldeps/exit-code/success.rs rename to src/test/run-make/exit-code/success.rs diff --git a/src/test/run-make-fulldeps/issue-22131/Makefile b/src/test/run-make/issue-22131/Makefile similarity index 81% rename from src/test/run-make-fulldeps/issue-22131/Makefile rename to src/test/run-make/issue-22131/Makefile index d76aaf5c146db..c2323dd972142 100644 --- a/src/test/run-make-fulldeps/issue-22131/Makefile +++ b/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/src/test/run-make-fulldeps/issue-22131/foo.rs b/src/test/run-make/issue-22131/foo.rs similarity index 100% rename from src/test/run-make-fulldeps/issue-22131/foo.rs rename to src/test/run-make/issue-22131/foo.rs diff --git a/src/test/run-make-fulldeps/issue-38237/Makefile b/src/test/run-make/issue-38237/Makefile similarity index 67% rename from src/test/run-make-fulldeps/issue-38237/Makefile rename to src/test/run-make/issue-38237/Makefile index 0a681401b1afb..b15bee910b38b 100644 --- a/src/test/run-make-fulldeps/issue-38237/Makefile +++ b/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/src/test/run-make-fulldeps/issue-38237/bar.rs b/src/test/run-make/issue-38237/bar.rs similarity index 100% rename from src/test/run-make-fulldeps/issue-38237/bar.rs rename to src/test/run-make/issue-38237/bar.rs diff --git a/src/test/run-make-fulldeps/issue-38237/baz.rs b/src/test/run-make/issue-38237/baz.rs similarity index 100% rename from src/test/run-make-fulldeps/issue-38237/baz.rs rename to src/test/run-make/issue-38237/baz.rs diff --git a/src/test/run-make-fulldeps/issue-38237/foo.rs b/src/test/run-make/issue-38237/foo.rs similarity index 100% rename from src/test/run-make-fulldeps/issue-38237/foo.rs rename to src/test/run-make/issue-38237/foo.rs diff --git a/src/test/run-make-fulldeps/rustdoc-determinism/Makefile b/src/test/run-make/rustdoc-determinism/Makefile similarity index 90% rename from src/test/run-make-fulldeps/rustdoc-determinism/Makefile rename to src/test/run-make/rustdoc-determinism/Makefile index 0534c2c383145..0535bce4f4611 100644 --- a/src/test/run-make-fulldeps/rustdoc-determinism/Makefile +++ b/src/test/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/src/test/run-make-fulldeps/rustdoc-determinism/bar.rs b/src/test/run-make/rustdoc-determinism/bar.rs similarity index 100% rename from src/test/run-make-fulldeps/rustdoc-determinism/bar.rs rename to src/test/run-make/rustdoc-determinism/bar.rs diff --git a/src/test/run-make-fulldeps/rustdoc-determinism/foo.rs b/src/test/run-make/rustdoc-determinism/foo.rs similarity index 100% rename from src/test/run-make-fulldeps/rustdoc-determinism/foo.rs rename to src/test/run-make/rustdoc-determinism/foo.rs diff --git a/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile b/src/test/run-make/rustdoc-error-lines/Makefile similarity index 91% rename from src/test/run-make-fulldeps/rustdoc-error-lines/Makefile rename to src/test/run-make/rustdoc-error-lines/Makefile index c9d41f0ec3b78..79060dc809c63 100644 --- a/src/test/run-make-fulldeps/rustdoc-error-lines/Makefile +++ b/src/test/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/src/test/run-make-fulldeps/rustdoc-error-lines/input.rs b/src/test/run-make/rustdoc-error-lines/input.rs similarity index 100% rename from src/test/run-make-fulldeps/rustdoc-error-lines/input.rs rename to src/test/run-make/rustdoc-error-lines/input.rs diff --git a/src/test/run-make-fulldeps/rustdoc-io-error/Makefile b/src/test/run-make/rustdoc-io-error/Makefile similarity index 94% rename from src/test/run-make-fulldeps/rustdoc-io-error/Makefile rename to src/test/run-make/rustdoc-io-error/Makefile index f95fa88d41cf7..66345f2b131c2 100644 --- a/src/test/run-make-fulldeps/rustdoc-io-error/Makefile +++ b/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/src/test/run-make-fulldeps/rustdoc-io-error/foo.rs b/src/test/run-make/rustdoc-io-error/foo.rs similarity index 100% rename from src/test/run-make-fulldeps/rustdoc-io-error/foo.rs rename to src/test/run-make/rustdoc-io-error/foo.rs diff --git a/src/test/run-make-fulldeps/rustdoc-map-file/Makefile b/src/test/run-make/rustdoc-map-file/Makefile similarity index 85% rename from src/test/run-make-fulldeps/rustdoc-map-file/Makefile rename to src/test/run-make/rustdoc-map-file/Makefile index ce977fa0cea55..debd3e3f92944 100644 --- a/src/test/run-make-fulldeps/rustdoc-map-file/Makefile +++ b/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/src/test/run-make-fulldeps/rustdoc-map-file/expected.json b/src/test/run-make/rustdoc-map-file/expected.json similarity index 100% rename from src/test/run-make-fulldeps/rustdoc-map-file/expected.json rename to src/test/run-make/rustdoc-map-file/expected.json diff --git a/src/test/run-make-fulldeps/rustdoc-map-file/foo.rs b/src/test/run-make/rustdoc-map-file/foo.rs similarity index 100% rename from src/test/run-make-fulldeps/rustdoc-map-file/foo.rs rename to src/test/run-make/rustdoc-map-file/foo.rs diff --git a/src/test/run-make-fulldeps/rustdoc-map-file/validate_json.py b/src/test/run-make/rustdoc-map-file/validate_json.py similarity index 100% rename from src/test/run-make-fulldeps/rustdoc-map-file/validate_json.py rename to src/test/run-make/rustdoc-map-file/validate_json.py diff --git a/src/test/run-make-fulldeps/rustdoc-output-path/Makefile b/src/test/run-make/rustdoc-output-path/Makefile similarity index 69% rename from src/test/run-make-fulldeps/rustdoc-output-path/Makefile rename to src/test/run-make/rustdoc-output-path/Makefile index 8ce1c699526cd..91ed72ec1d653 100644 --- a/src/test/run-make-fulldeps/rustdoc-output-path/Makefile +++ b/src/test/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/src/test/run-make-fulldeps/rustdoc-output-path/foo.rs b/src/test/run-make/rustdoc-output-path/foo.rs similarity index 100% rename from src/test/run-make-fulldeps/rustdoc-output-path/foo.rs rename to src/test/run-make/rustdoc-output-path/foo.rs diff --git a/src/test/run-make-fulldeps/print-unversioned-files/Makefile b/src/test/run-make/rustdoc-print-unversioned-files/Makefile similarity index 82% rename from src/test/run-make-fulldeps/print-unversioned-files/Makefile rename to src/test/run-make/rustdoc-print-unversioned-files/Makefile index e368f61cddfc3..820bd30b6ded8 100644 --- a/src/test/run-make-fulldeps/print-unversioned-files/Makefile +++ b/src/test/run-make/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/src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt b/src/test/run-make/rustdoc-print-unversioned-files/unversioned-files.txt similarity index 100% rename from src/test/run-make-fulldeps/print-unversioned-files/unversioned-files.txt rename to src/test/run-make/rustdoc-print-unversioned-files/unversioned-files.txt diff --git a/src/test/run-make-fulldeps/rustdoc-themes/Makefile b/src/test/run-make/rustdoc-themes/Makefile similarity index 88% rename from src/test/run-make-fulldeps/rustdoc-themes/Makefile rename to src/test/run-make/rustdoc-themes/Makefile index f5a471e66e573..37961842c3c4b 100644 --- a/src/test/run-make-fulldeps/rustdoc-themes/Makefile +++ b/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/src/test/run-make-fulldeps/rustdoc-themes/foo.rs b/src/test/run-make/rustdoc-themes/foo.rs similarity index 100% rename from src/test/run-make-fulldeps/rustdoc-themes/foo.rs rename to src/test/run-make/rustdoc-themes/foo.rs