Skip to content

Commit dbf9327

Browse files
authored
Unrolled build for rust-lang#130143
Rollup merge of rust-lang#130143 - RalfJung:miri-test-libstd, r=compiler-errors miri-test-libstd: add missing BOOTSTRAP_ARGS Note sure if BOOTSTRAP_ARGS will make any difference here, but all the other x.py invocations have it and I did not *deliberately* leave it away when I added these, so... probably best to add them? Also don't unnecessarily set BOOTSTRAP_SKIP_TARGET_SANITY while we are at it.
2 parents 33855f8 + 62d196f commit dbf9327

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

Diff for: src/bootstrap/mk/Makefile.in

+6-2
Original file line numberDiff line numberDiff line change
@@ -54,30 +54,34 @@ check-aux:
5454
src/etc/test-float-parse \
5555
$(BOOTSTRAP_ARGS)
5656
# Run standard library tests in Miri.
57-
$(Q)BOOTSTRAP_SKIP_TARGET_SANITY=1 \
58-
$(BOOTSTRAP) miri --stage 2 \
57+
$(Q)$(BOOTSTRAP) miri --stage 2 \
5958
library/core \
6059
library/alloc \
60+
$(BOOTSTRAP_ARGS) \
6161
--no-doc
6262
# Some doctests use file system operations to demonstrate dealing with `Result`.
6363
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
6464
$(BOOTSTRAP) miri --stage 2 \
6565
library/core \
6666
library/alloc \
67+
$(BOOTSTRAP_ARGS) \
6768
--doc
6869
# In `std` we cannot test everything, so we skip some modules.
6970
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
7071
$(BOOTSTRAP) miri --stage 2 library/std \
72+
$(BOOTSTRAP_ARGS) \
7173
--no-doc -- \
7274
--skip fs:: --skip net:: --skip process:: --skip sys::pal::
7375
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
7476
$(BOOTSTRAP) miri --stage 2 library/std \
77+
$(BOOTSTRAP_ARGS) \
7578
--doc -- \
7679
--skip fs:: --skip net:: --skip process:: --skip sys::pal::
7780
# Also test some very target-specific modules on other targets
7881
# (making sure to cover an i686 target as well).
7982
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
8083
$(BOOTSTRAP) miri --stage 2 library/std \
84+
$(BOOTSTRAP_ARGS) \
8185
--target aarch64-apple-darwin,i686-pc-windows-msvc \
8286
--no-doc -- \
8387
time:: sync:: thread:: env::

0 commit comments

Comments
 (0)