about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDrMeepster <19316085+DrMeepster@users.noreply.github.com>2023-05-20 21:14:08 -0700
committerGitHub <noreply@github.com>2023-05-20 21:14:08 -0700
commita287d1b89ca1aa5a69061dc099eba35fd158e301 (patch)
treef8a3261e1df073910ed53555c90b097c69264a83
parent1b67f8b013890fec98e4a2e72b568731d3a58c1f (diff)
downloadrust-a287d1b89ca1aa5a69061dc099eba35fd158e301.tar.gz
rust-a287d1b89ca1aa5a69061dc099eba35fd158e301.zip
unset MIRI_BLESS for mir-opt-level 4 miri tests
-rw-r--r--src/bootstrap/test.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 2d600704e02..2b72d6c48eb 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -620,6 +620,8 @@ impl Step for Miri {
             cargo.env("MIRIFLAGS", "-O -Zmir-opt-level=4 -Cdebug-assertions=yes");
             // Optimizations can change backtraces
             cargo.env("MIRI_SKIP_UI_CHECKS", "1");
+            // `MIRI_SKIP_UI_CHECKS` and `MIRI_BLESS` are incompatible
+            cargo.env_remove("MIRI_BLESS");
             // Optimizations can change error locations and remove UB so don't run `fail` tests.
             cargo.args(&["tests/pass", "tests/panic"]);