about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-06-08 18:37:59 +0200
committerGitHub <noreply@github.com>2024-06-08 18:37:59 +0200
commitea26e7b2fab76a5c51cd34fe8b4d0cfe2c4b26c3 (patch)
tree3fe1359c14aead75e50b35a3988df3f46c3b7640
parent9395236d3d354ec58ecee58c0cc5076d2d8da013 (diff)
parentd5671d06a493eae3dd4973ef98c7f1a81998e9da (diff)
downloadrust-ea26e7b2fab76a5c51cd34fe8b4d0cfe2c4b26c3.tar.gz
rust-ea26e7b2fab76a5c51cd34fe8b4d0cfe2c4b26c3.zip
Rollup merge of #126149 - RalfJung:miri-std-tests, r=clubby789
Miri std tests: don't set BOOTSTRAP_SKIP_TARGET_SANITY unnecessarily

Also explain why we disable isolation, while we are at it.
-rw-r--r--src/bootstrap/mk/Makefile.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index fc433bc5843..cab37e0da47 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -59,17 +59,18 @@ check-aux:
 		library/alloc \
 		--no-doc
 	# Some doctests have intentional memory leaks.
+	# Some use file system operations to demonstrate dealing with `Result`.
 	$(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" \
 		$(BOOTSTRAP) miri --stage 2 \
 		library/core \
 		library/alloc \
 		--doc
-	# In `std` we cannot test everything.
-	$(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
+	# In `std` we cannot test everything, so we skip some modules.
+	$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
 		$(BOOTSTRAP) miri --stage 2 library/std \
 		--no-doc -- \
 		--skip fs:: --skip net:: --skip process:: --skip sys::pal::
-	$(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
+	$(Q)MIRIFLAGS="-Zmiri-ignore-leaks -Zmiri-disable-isolation" \
 		$(BOOTSTRAP) miri --stage 2 library/std \
 		--doc -- \
 		--skip fs:: --skip net:: --skip process:: --skip sys::pal::