Include miri, drop cargotest

rust-lang · Sep 1, 2024 · f989c1b · f989c1b
1 parent c23d548
commit f989c1b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh b/src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh
@@ -8,24 +8,28 @@ X_PY="$1"
 
 # Try to test the toolstate-tracked tools and store the build/test success in the TOOLSTATE_FILE.
 
-set +e
-python3 "$X_PY" test --stage 2 --no-fail-fast \
-    src/doc/book \
-    src/doc/nomicon \
-    src/doc/reference \
-    src/doc/rust-by-example \
-    src/doc/embedded-book \
-    src/doc/edition-guide \
+# Pre-build the compiler and the library first to output a better error message when the build
+# itself fails (see https://github.com/rust-lang/rust/issues/127869 for context).
+python3 "$X_PY" build --stage 2 compiler rustdoc
 
-set -e
+# set +e
+# python3 "$X_PY" test --stage 2 --no-fail-fast \
+#     src/doc/book \
+#     src/doc/nomicon \
+#     src/doc/reference \
+#     src/doc/rust-by-example \
+#     src/doc/embedded-book \
+#     src/doc/edition-guide \
+
+# set -e
 
 # debugging: print out the saved toolstates
 cat /tmp/toolstate/toolstates.json
-
+#
 # Test remaining tools that must pass.
-python3 "$X_PY" test --stage 2 check-tools
-python3 "$X_PY" test --stage 2 src/tools/clippy
-python3 "$X_PY" test --stage 2 src/tools/rustfmt
+# python3 "$X_PY" test --stage 2 check-tools
+# python3 "$X_PY" test --stage 2 src/tools/clippy
+# python3 "$X_PY" test --stage 2 src/tools/rustfmt
 
 # Testing Miri is a bit more complicated.
 # We set the GC interval to the shortest possible value (0 would be off) to increase the chance

diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml
@@ -82,14 +82,14 @@ envs:
 pr:
   - image: x86_64-msvc-ext1
     env:
-      SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
+      SCRIPT: python x.py --stage 2 test src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
       HOST_TARGET: x86_64-pc-windows-msvc
       RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json --set build.cargo=C:/a/rust/rust/cargo.exe
       DEPLOY_TOOLSTATES_JSON: toolstates-windows.json
     <<: *job-windows-8c
   - image: x86_64-msvc-ext2
     env:
-      SCRIPT: python x.py --stage 2 test src/tools/cargotest src/tools/cargo
+      SCRIPT: python x.py --stage 2 test src/tools/cargo && src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh x.py /tmp/toolstate/toolstates.json windows
       HOST_TARGET: x86_64-pc-windows-msvc
       RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld --save-toolstates=/tmp/toolstate/toolstates.json --set build.cargo=C:/a/rust/rust/cargo.exe
       DEPLOY_TOOLSTATES_JSON: toolstates-windows.json