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

[rust.git] / ci.sh

diff --git a/ci.sh b/ci.sh
index 0625c25575726d40c5bcefb3860d3c0a310e2dc1..56a6f1228ab597941e1c8f0aff0b912cfdb5ab49 100755 (executable)
--- a/ci.sh
+++ b/ci.sh
@@ -23,11 +23,10 @@ function run_tests {
   fi
 
   ./miri test --locked
-  #if ! [ -n "${MIRI_TEST_TARGET+exists}" ]; then
+  if ! [ -n "${MIRI_TEST_TARGET+exists}" ]; then
     # Only for host architecture: tests with MIR optimizations
-    # FIXME: disabled because of <https://github.com/rust-lang/rust/issues/73609>.
-    #MIRI_TEST_FLAGS="-Z mir-opt-level=3" ./miri test --locked
-  #fi
+    MIRIFLAGS="-Z mir-opt-level=3" ./miri test --locked
+  fi
   # "miri test" has built the sysroot for us, now this should pass without
   # any interactive questions.
   ${PYTHON:-python3} test-cargo-miri/run-test.py
@@ -43,9 +42,8 @@ if [ "${TRAVIS_OS_NAME:-}" == linux ]; then
   MIRI_TEST_TARGET=x86_64-apple-darwin run_tests
   MIRI_TEST_TARGET=i686-pc-windows-msvc run_tests
 elif [ "${TRAVIS_OS_NAME:-}" == osx ]; then
-  MIRI_TEST_TARGET=i686-unknown-linux-gnu run_tests
+  MIRI_TEST_TARGET=mips64-unknown-linux-gnuabi64 run_tests # big-endian architecture
   MIRI_TEST_TARGET=x86_64-pc-windows-msvc run_tests
-  MIRI_TEST_TARGET=i686-pc-windows-gnu run_tests
 elif [ "${CI_WINDOWS:-}" == True ]; then
   MIRI_TEST_TARGET=x86_64-unknown-linux-gnu run_tests
   MIRI_TEST_TARGET=x86_64-apple-darwin run_tests