Skip to content

Commit f8fb4e8

Browse files
committed
Auto merge of #143867 - fmease:rollup-5tll6m9, r=fmease
Rollup of 12 pull requests Successful merges: - rust-lang/rust#143776 (std: move NuttX to use arc4random for random number generation) - rust-lang/rust#143778 (Some const_trait_impl test cleanups) - rust-lang/rust#143782 (Disambiguate between rustc vs std having debug assertions in `run-make-support` and `run-make` tests) - rust-lang/rust#143791 (Update sysinfo version to `0.36.0`) - rust-lang/rust#143796 (Fix ICE for parsed attributes with longer path not handled by CheckAttribute) - rust-lang/rust#143798 (Remove format short command trait) - rust-lang/rust#143803 (New tracking issues for const_ops and const_cmp) - rust-lang/rust#143814 (htmldocck: better error messages for some negative directives) - rust-lang/rust#143817 (Access `wasi_sdk_path` instead of reading environment variable in bootstrap) - rust-lang/rust#143822 (./x test miri: fix cleaning the miri_ui directory) - rust-lang/rust#143823 ([COMPILETEST-UNTANGLE 5/N] Test mode adjustments and other assorted cleanups) - rust-lang/rust#143841 (Label clippy changes with `T-clippy`) Failed merges: - rust-lang/rust#143850 (Compiletest: Simplify {Html,Json}DocCk directive handling) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 9dfce15 + b0740fa commit f8fb4e8

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

tests/ui.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ fn miri_config(
9797
let mut config = Config {
9898
target: Some(target.to_owned()),
9999
program,
100+
// When changing this, remember to also adjust the logic in bootstrap, in Miri's test step,
101+
// that deletes the `miri_ui` dir when it needs a rebuild.
100102
out_dir: PathBuf::from(env!("CARGO_TARGET_TMPDIR")).join("miri_ui"),
101103
threads: std::env::var("MIRI_TEST_THREADS")
102104
.ok()

0 commit comments

Comments
 (0)