Skip to content

Commit 1d4757c

Browse files
committed
Auto merge of #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 ac17c34 + 73fcdf6 commit 1d4757c

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

library/std/src/io/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2335,6 +2335,7 @@ pub trait BufRead: Read {
23352335
/// #![feature(buf_read_has_data_left)]
23362336
/// use std::io;
23372337
/// use std::io::prelude::*;
2338+
/// # if cfg!(all(miri, windows)) { return; } // FIXME(miri-windows-file-access)
23382339
///
23392340
/// let stdin = io::stdin();
23402341
/// let mut stdin = stdin.lock();

src/bootstrap/mk/Makefile.in

Lines changed: 2 additions & 8 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 \
@@ -72,20 +73,13 @@ check-aux:
7273
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" \
7374
$(BOOTSTRAP) miri --stage 2 library/std \
7475
$(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 \
79-
$(BOOTSTRAP_ARGS) \
80-
--doc -- \
8176
--skip fs:: --skip net:: --skip process:: --skip sys::fd:: --skip sys::pal::
8277
# Also test some very target-specific modules on other targets
8378
# (making sure to cover an i686 target as well).
8479
$(Q)MIRIFLAGS="-Zmiri-disable-isolation" BOOTSTRAP_SKIP_TARGET_SANITY=1 \
8580
$(BOOTSTRAP) miri --stage 2 library/std \
8681
$(BOOTSTRAP_ARGS) \
8782
--target aarch64-apple-darwin,i686-pc-windows-msvc \
88-
--no-doc -- \
8983
time:: sync:: thread:: env::
9084
dist:
9185
$(Q)$(BOOTSTRAP) dist $(BOOTSTRAP_ARGS)

0 commit comments

Comments
 (0)