bootstrap/Makefile.in: miri: add missing BOOTSTRAP ARGS

also don't unnecessarily set BOOTSTRAP_SKIP_TARGET_SANITY while we are at it
This commit is contained in:
Ralf Jung 2024-09-09 11:20:22 +02:00
parent 263a3aeeb8
commit 62d196feb1

View File

@ -54,30 +54,34 @@ check-aux:
src/etc/test-float-parse \ src/etc/test-float-parse \
$(BOOTSTRAP_ARGS) $(BOOTSTRAP_ARGS)
# Run standard library tests in Miri. # Run standard library tests in Miri.
$(Q)BOOTSTRAP_SKIP_TARGET_SANITY=1 \ $(Q)$(BOOTSTRAP) miri --stage 2 \
$(BOOTSTRAP) miri --stage 2 \
library/core \ library/core \
library/alloc \ library/alloc \
$(BOOTSTRAP_ARGS) \
--no-doc --no-doc
# Some doctests use file system operations to demonstrate dealing with `Result`. # Some doctests use file system operations to demonstrate dealing with `Result`.
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \ $(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
$(BOOTSTRAP) miri --stage 2 \ $(BOOTSTRAP) miri --stage 2 \
library/core \ library/core \
library/alloc \ library/alloc \
$(BOOTSTRAP_ARGS) \
--doc --doc
# In `std` we cannot test everything, so we skip some modules. # In `std` we cannot test everything, so we skip some modules.
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \ $(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
$(BOOTSTRAP) miri --stage 2 library/std \ $(BOOTSTRAP) miri --stage 2 library/std \
$(BOOTSTRAP_ARGS) \
--no-doc -- \ --no-doc -- \
--skip fs:: --skip net:: --skip process:: --skip sys::pal:: --skip fs:: --skip net:: --skip process:: --skip sys::pal::
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \ $(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
$(BOOTSTRAP) miri --stage 2 library/std \ $(BOOTSTRAP) miri --stage 2 library/std \
$(BOOTSTRAP_ARGS) \
--doc -- \ --doc -- \
--skip fs:: --skip net:: --skip process:: --skip sys::pal:: --skip fs:: --skip net:: --skip process:: --skip sys::pal::
# Also test some very target-specific modules on other targets # Also test some very target-specific modules on other targets
# (making sure to cover an i686 target as well). # (making sure to cover an i686 target as well).
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \ $(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
$(BOOTSTRAP) miri --stage 2 library/std \ $(BOOTSTRAP) miri --stage 2 library/std \
$(BOOTSTRAP_ARGS) \
--target aarch64-apple-darwin,i686-pc-windows-msvc \ --target aarch64-apple-darwin,i686-pc-windows-msvc \
--no-doc -- \ --no-doc -- \
time:: sync:: thread:: env:: time:: sync:: thread:: env::