Auto merge of #1774 - RalfJung:contrib, r=RalfJung

[rust.git] / ci.sh

diff --git a/ci.sh b/ci.sh
index 8827c90d3bdf13510e2091728a8bb338e7532e7b..a86c5ca490a40fa06cad32df515f257a132ffdd9 100755 (executable)
--- a/ci.sh
+++ b/ci.sh
@@ -2,8 +2,6 @@
 set -euo pipefail
 
 # Determine configuration
-export RUST_TEST_NOCAPTURE=1
-export RUST_BACKTRACE=1
 export RUSTFLAGS="-D warnings"
 export CARGO_INCREMENTAL=0
 export CARGO_EXTRA_FLAGS="--all-features"
@@ -24,9 +22,9 @@ function run_tests {
 
   ./miri test --locked
   if [ -z "${MIRI_TEST_TARGET+exists}" ]; then
-    # Only for host architecture: tests with MIR optimizations
-    #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
+    # Only for host architecture: tests with optimizations (`-O` is what cargo passes, but crank MIR
+    # optimizations up all the way).
+    MIRIFLAGS="-O -Zmir-opt-level=4" ./miri test --locked
   fi
 
   # On Windows, there is always "python", not "python3" or "python2".
@@ -48,7 +46,7 @@ run_tests
 case $HOST_TARGET in
   x86_64-unknown-linux-gnu)
     MIRI_TEST_TARGET=i686-unknown-linux-gnu run_tests
-    MIRI_TEST_TARGET=x86_64-apple-darwin run_tests
+    MIRI_TEST_TARGET=aarch64-apple-darwin run_tests
     MIRI_TEST_TARGET=i686-pc-windows-msvc run_tests
     ;;
   x86_64-apple-darwin)