From f3bbfaccecd4cacf7267ba7c63f8729e811be3f5 Mon Sep 17 00:00:00 2001
From: Zalathar <Zalathar@users.noreply.github.com>
Date: Wed, 8 Oct 2025 21:25:13 +1100
Subject: [PATCH 1/2] Support `x check rustdoc-gui-test`

This is useful for ensuring that changes to compiletest haven't broken
rustdoc-gui-test.
---
 src/bootstrap/src/core/build_steps/check.rs | 9 +++++++++
 src/bootstrap/src/core/builder/mod.rs       | 1 +
 2 files changed, 10 insertions(+)

diff --git a/src/bootstrap/src/core/build_steps/check.rs b/src/bootstrap/src/core/build_steps/check.rs
index 20c54a28dda83..400c6f732c3c3 100644
--- a/src/bootstrap/src/core/build_steps/check.rs
+++ b/src/bootstrap/src/core/build_steps/check.rs
@@ -821,6 +821,15 @@ tool_check_step!(Compiletest {
     default: false,
 });
 
+// As with compiletest, rustdoc-gui-test is automatically built when running
+// relevant tests. So being able to check it is mainly useful for people
+// working on on rustdoc-gui-test itself, or on its compiletest dependency.
+tool_check_step!(RustdocGuiTest {
+    path: "src/tools/rustdoc-gui-test",
+    mode: Mode::ToolBootstrap,
+    default: false,
+});
+
 tool_check_step!(Linkchecker {
     path: "src/tools/linkchecker",
     mode: Mode::ToolBootstrap,
diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs
index fc06db8f80b9d..cd3961056d2c1 100644
--- a/src/bootstrap/src/core/builder/mod.rs
+++ b/src/bootstrap/src/core/builder/mod.rs
@@ -1071,6 +1071,7 @@ impl<'a> Builder<'a> {
                 check::Bootstrap,
                 check::RunMakeSupport,
                 check::Compiletest,
+                check::RustdocGuiTest,
                 check::FeaturesStatusDump,
                 check::CoverageDump,
                 check::Linkchecker,

From ebb52ff6b1cf8cbf6a7b371bfc7e366705050157 Mon Sep 17 00:00:00 2001
From: Zalathar <Zalathar@users.noreply.github.com>
Date: Wed, 8 Oct 2025 21:42:28 +1100
Subject: [PATCH 2/2] Do `x check` on various bootstrap tools in CI

---
 src/ci/docker/host-x86_64/pr-check-2/Dockerfile | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/ci/docker/host-x86_64/pr-check-2/Dockerfile b/src/ci/docker/host-x86_64/pr-check-2/Dockerfile
index 0a95f428f5bd8..af4cc4baadbd8 100644
--- a/src/ci/docker/host-x86_64/pr-check-2/Dockerfile
+++ b/src/ci/docker/host-x86_64/pr-check-2/Dockerfile
@@ -28,7 +28,17 @@ RUN sh /scripts/sccache.sh
 
 ENV SCRIPT \
         python3 ../x.py check && \
-        python3 ../x.py check src/tools/bump-stage0 && \
+        # Check some tools that aren't included in `x check` by default, to
+        # ensure that maintainers can still do check builds locally.
+        python3 ../x.py check \
+            bootstrap \
+            bump-stage0 \
+            compiletest \
+            coverage-dump \
+            linkchecker \
+            run-make-support \
+            rustdoc-gui-test \
+            && \
         python3 ../x.py clippy ci --stage 2 && \
         python3 ../x.py test --stage 1 core alloc std test proc_macro && \
         python3 ../x.py test --stage 1 src/tools/compiletest && \