diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-05-21 16:03:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-21 16:03:01 +0200 |
| commit | b4752cfbc752241646a1eff881ff39b0216791d0 (patch) | |
| tree | ecd71cc1df14d1019d5c1f88eebda41c88f8deaf | |
| parent | 0afa79b53d836a53081404acb076715a7e9c92d2 (diff) | |
| parent | a287d1b89ca1aa5a69061dc099eba35fd158e301 (diff) | |
| download | rust-b4752cfbc752241646a1eff881ff39b0216791d0.tar.gz rust-b4752cfbc752241646a1eff881ff39b0216791d0.zip | |
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.
| -rw-r--r-- | src/bootstrap/test.rs | 2 |
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"]); |