Rename tests/rustdoc into tests/rustdoc-html

Author: GuillaumeGomez

rustfmt.toml

@@ -21,7 +21,7 @@ ignore = [
     "/tests/pretty/",                 # These tests are very sensitive to source code layout.
     "/tests/run-make/export",         # These tests contain syntax errors.
     "/tests/run-make/translation/test.rs", # This test contains syntax errors.
-    "/tests/rustdoc/",                # Some have syntax errors, some are whitespace-sensitive.
+    "/tests/rustdoc-html/",           # Some have syntax errors, some are whitespace-sensitive.
     "/tests/rustdoc-gui/",            # Some tests are sensitive to source code layout.
     "/tests/rustdoc-ui/",             # Some have syntax errors, some are whitespace-sensitive.
     "/tests/ui/",                     # Some have syntax errors, some are whitespace-sensitive.

src/bootstrap/src/core/build_steps/test.rs

@@ -1583,9 +1583,9 @@ test!(UiFullDeps {
 });
 
 test!(Rustdoc {
-    path: "tests/rustdoc",
+    path: "tests/rustdoc-html",
     mode: CompiletestMode::Rustdoc,
-    suite: "rustdoc",
+    suite: "rustdoc-html",
     default: true,
     IS_HOST: true,
 });
@@ -2758,7 +2758,7 @@ impl Step for ErrorIndex {
     fn make_run(run: RunConfig<'_>) {
         // error_index_generator depends on librustdoc. Use the compiler that
         // is normally used to build rustdoc for other tests (like compiletest
-        // tests in tests/rustdoc) so that it shares the same artifacts.
+        // tests in tests/rustdoc-html) so that it shares the same artifacts.
         let compilers = RustcPrivateCompilers::new(
             run.builder,
             run.builder.top_stage,
@@ -3159,7 +3159,7 @@ impl Step for CrateRustdoc {
             builder.compiler(builder.top_stage, target)
         } else {
             // Use the previous stage compiler to reuse the artifacts that are
-            // created when running compiletest for tests/rustdoc. If this used
+            // created when running compiletest for tests/rustdoc-html. If this used
             // `compiler`, then it would cause rustdoc to be built *again*, which
             // isn't really necessary.
             builder.compiler_for(builder.top_stage, target, target)

src/bootstrap/src/core/builder/cli_paths.rs

@@ -31,8 +31,8 @@ pub(crate) const PATH_REMAP: &[(&str, &[&str])] = &[
             "tests/pretty",
             "tests/run-make",
             "tests/run-make-cargo",
-            "tests/rustdoc",
             "tests/rustdoc-gui",
+            "tests/rustdoc-html",
             "tests/rustdoc-js",
             "tests/rustdoc-js-std",
             "tests/rustdoc-json",

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test.snap

@@ -40,7 +40,7 @@ expression: test
     - Suite(test::tests/ui-fulldeps)
 [Test] test::Rustdoc
     targets: [x86_64-unknown-linux-gnu]
-    - Suite(test::tests/rustdoc)
+    - Suite(test::tests/rustdoc-html)
 [Test] test::CoverageRunRustdoc
     targets: [x86_64-unknown-linux-gnu]
     - Suite(test::tests/coverage-run-rustdoc)

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_librustdoc_rustdoc.snap

@@ -7,7 +7,7 @@ expression: test librustdoc rustdoc
     - Set({test::src/librustdoc, test::src/tools/rustdoc})
 [Test] test::Rustdoc
     targets: [x86_64-unknown-linux-gnu]
-    - Suite(test::tests/rustdoc)
+    - Suite(test::tests/rustdoc-html)
 [Test] test::RustdocBook
     targets: [x86_64-unknown-linux-gnu]
     - Set({test::src/doc/rustdoc})

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_rustdoc.snap

@@ -4,7 +4,7 @@ expression: test rustdoc
 ---
 [Test] test::Rustdoc
     targets: [x86_64-unknown-linux-gnu]
-    - Suite(test::tests/rustdoc)
+    - Suite(test::tests/rustdoc-html)
 [Test] test::CrateRustdoc
     targets: [x86_64-unknown-linux-gnu]
     - Set({test::src/tools/rustdoc})

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_skip_coverage.snap

@@ -39,7 +39,7 @@ expression: test --skip=coverage
     - Suite(test::tests/ui-fulldeps)
 [Test] test::Rustdoc
     targets: [x86_64-unknown-linux-gnu]
-    - Suite(test::tests/rustdoc)
+    - Suite(test::tests/rustdoc-html)
 [Test] test::CoverageRunRustdoc
     targets: [x86_64-unknown-linux-gnu]
     - Suite(test::tests/coverage-run-rustdoc)

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_tests.snap

@@ -40,7 +40,7 @@ expression: test tests
     - Suite(test::tests/run-make-cargo)
 [Test] test::Rustdoc
     targets: [x86_64-unknown-linux-gnu]
-    - Suite(test::tests/rustdoc)
+    - Suite(test::tests/rustdoc-html)
 [Test] test::RustdocGUI
     targets: [x86_64-unknown-linux-gnu]
     - Suite(test::tests/rustdoc-gui)

src/bootstrap/src/core/builder/cli_paths/snapshots/x_test_tests_skip_coverage.snap

@@ -37,7 +37,7 @@ expression: test tests --skip=coverage
     - Suite(test::tests/run-make-cargo)
 [Test] test::Rustdoc
     targets: [x86_64-unknown-linux-gnu]
-    - Suite(test::tests/rustdoc)
+    - Suite(test::tests/rustdoc-html)
 [Test] test::RustdocGUI
     targets: [x86_64-unknown-linux-gnu]
     - Suite(test::tests/rustdoc-gui)

src/ci/citool/tests/test-jobs.yml

@@ -27,7 +27,7 @@ runners:
     <<: *base-job
 envs:
   env-x86_64-apple-tests: &env-x86_64-apple-tests
-    SCRIPT: ./x.py check compiletest && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact
+    SCRIPT: ./x.py check compiletest && ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc-html -- --exact
     RUST_CONFIGURE_ARGS: --build=x86_64-apple-darwin --enable-sanitizers --enable-profiler --set rust.jemalloc
     RUSTC_RETRY_LINKER_ON_SEGFAULT: 1
     # Ensure that host tooling is tested on our minimum supported macOS version.