Auto merge of #1573 - RalfJung:rustup, r=RalfJung

rustup; disable opt level >=2 tests due to ICE Cc rust-lang/rust#77564 for the ICE
rust-lang · Oct 5, 2020 · 95f0ad1 · 95f0ad1
2 parents 60c1075 + 808032a
commit 95f0ad1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ci.sh b/ci.sh
@@ -25,7 +25,8 @@ function run_tests {
   ./miri test --locked
   if ! [ -n "${MIRI_TEST_TARGET+exists}" ]; then
     # Only for host architecture: tests with MIR optimizations
-    MIRIFLAGS="-Z mir-opt-level=3" ./miri test --locked
+    #FIXME: Only testing opt level 1 due to <https://github.com/rust-lang/rust/issues/77564>.
+    MIRIFLAGS="-Z mir-opt-level=1" ./miri test --locked
   fi
   # "miri test" has built the sysroot for us, now this should pass without
   # any interactive questions.

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-a835b483fe0418b48ca44afb65cd0dd6bad4eb9b
+efbaa413061c2a6e52f06f00a60ee7830fcf3ea5