Skip to content

Commit b4752cf

Browse files
authored
Rollup merge of #111809 - DrMeepster:patch-1, r=jyn514
Unset MIRI_BLESS for mir-opt-level 4 miri tests When running `x.py test src/tools/miri --bless`, the 2nd test run (with mir-opt-level 4) crashes because it disables ui checking, which is incompatible with blessing. This PR fixes that by not trying to bless that run.
2 parents 0afa79b + a287d1b commit b4752cf

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

Diff for: src/bootstrap/test.rs

+2
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,8 @@ impl Step for Miri {
620620
cargo.env("MIRIFLAGS", "-O -Zmir-opt-level=4 -Cdebug-assertions=yes");
621621
// Optimizations can change backtraces
622622
cargo.env("MIRI_SKIP_UI_CHECKS", "1");
623+
// `MIRI_SKIP_UI_CHECKS` and `MIRI_BLESS` are incompatible
624+
cargo.env_remove("MIRI_BLESS");
623625
// Optimizations can change error locations and remove UB so don't run `fail` tests.
624626
cargo.args(&["tests/pass", "tests/panic"]);
625627

0 commit comments

Comments
 (0)