Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 8418ba9

Browse files
committed
Auto merge of rust-lang#141210 - RalfJung:miri-std-doctests, r=<try>
tools-aux ci runner: also cross-test doctests in Miri Miri now supports running doctests across different targets. Let's use that to run the std doctests on aarch64-apple-darwin, i686-pc-windows-msvc. try-job: x86_64-gnu-aux
2 parents 6eef33b + b9e6995 commit 8418ba9

File tree

1 file changed

+11
-12
lines changed

1 file changed

+11
-12
lines changed

src/bootstrap/mk/Makefile.in

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,15 @@ check-aux:
5454
src/etc/test-float-parse \
5555
$(BOOTSTRAP_ARGS)
5656
# Run standard library tests in Miri.
57-
$(Q)$(BOOTSTRAP) miri --stage 2 \
57+
$(Q)MIRIFLAGS="-Zmiri-strict-provenance" \
58+
$(BOOTSTRAP) miri --stage 2 \
5859
library/coretests \
5960
library/alloctests \
6061
library/alloc \
6162
$(BOOTSTRAP_ARGS) \
6263
--no-doc
63-
# Some doctests use file system operations to demonstrate dealing with `Result`.
64+
# Some doctests use file system operations to demonstrate dealing with `Result`,
65+
# so we have to run them with isolation disabled.
6466
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
6567
$(BOOTSTRAP) miri --stage 2 \
6668
library/coretests \
@@ -70,22 +72,19 @@ check-aux:
7072
--doc
7173
# In `std` we cannot test everything, so we skip some modules.
7274
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
73-
$(BOOTSTRAP) miri --stage 2 library/std \
74-
$(BOOTSTRAP_ARGS) \
75-
--no-doc -- \
76-
--skip fs:: --skip net:: --skip process:: --skip sys::fd:: --skip sys::pal::
77-
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
78-
$(BOOTSTRAP) miri --stage 2 library/std \
75+
$(BOOTSTRAP) miri --stage 2 \
76+
library/std \
7977
$(BOOTSTRAP_ARGS) \
80-
--doc -- \
78+
-- \
8179
--skip fs:: --skip net:: --skip process:: --skip sys::fd:: --skip sys::pal::
8280
# Also test some very target-specific modules on other targets
8381
# (making sure to cover an i686 target as well).
8482
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
85-
$(BOOTSTRAP) miri --stage 2 library/std \
86-
$(BOOTSTRAP_ARGS) \
83+
$(BOOTSTRAP) miri --stage 2 \
84+
library/std \
8785
--target aarch64-apple-darwin,i686-pc-windows-msvc \
88-
--no-doc -- \
86+
$(BOOTSTRAP_ARGS) \
87+
-- \
8988
time:: sync:: thread:: env::
9089
dist:
9190
$(Q)$(BOOTSTRAP) dist $(BOOTSTRAP_ARGS)

0 commit comments

Comments
 (0)