Skip to content

Commit 6eb1afa

Browse files
committed
tools-aux ci runner: also cross-test doctests
1 parent ac17c34 commit 6eb1afa

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

src/bootstrap/mk/Makefile.in

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ check-aux:
6060
library/alloc \
6161
$(BOOTSTRAP_ARGS) \
6262
--no-doc
63-
# Some doctests use file system operations to demonstrate dealing with `Result`.
63+
# Some doctests use file system operations to demonstrate dealing with `Result`,
64+
# so we have to run them with isolation disabled.
6465
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
6566
$(BOOTSTRAP) miri --stage 2 \
6667
library/coretests \
@@ -70,22 +71,19 @@ check-aux:
7071
--doc
7172
# In `std` we cannot test everything, so we skip some modules.
7273
$(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 \
74+
$(BOOTSTRAP) miri --stage 2 \
75+
library/std \
7976
$(BOOTSTRAP_ARGS) \
80-
--doc -- \
77+
-- \
8178
--skip fs:: --skip net:: --skip process:: --skip sys::fd:: --skip sys::pal::
8279
# Also test some very target-specific modules on other targets
8380
# (making sure to cover an i686 target as well).
8481
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
85-
$(BOOTSTRAP) miri --stage 2 library/std \
86-
$(BOOTSTRAP_ARGS) \
82+
$(BOOTSTRAP) miri --stage 2 \
83+
library/std \
8784
--target aarch64-apple-darwin,i686-pc-windows-msvc \
88-
--no-doc -- \
85+
$(BOOTSTRAP_ARGS) \
86+
-- \
8987
time:: sync:: thread:: env::
9088
dist:
9189
$(Q)$(BOOTSTRAP) dist $(BOOTSTRAP_ARGS)

0 commit comments

Comments
 (0)