From a287d1b89ca1aa5a69061dc099eba35fd158e301 Mon Sep 17 00:00:00 2001
From: DrMeepster <19316085+DrMeepster@users.noreply.github.com>
Date: Sat, 20 May 2023 21:14:08 -0700
Subject: [PATCH] unset MIRI_BLESS for mir-opt-level 4 miri tests

---
 src/bootstrap/test.rs | 2 ++
 1 file changed, 2 insertions(+)

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"]);