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

[rust.git] / ci.sh

diff --git a/ci.sh b/ci.sh
index a7254f2958a0ae0c80a1088ba67ca362610b08fb..56a6f1228ab597941e1c8f0aff0b912cfdb5ab49 100755 (executable)
--- a/ci.sh
+++ b/ci.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 # Determine configuration
 export RUST_TEST_NOCAPTURE=1
 export RUST_BACKTRACE=1
-export RUSTC_EXTRA_FLAGS="-D warnings"
+export RUSTFLAGS="-D warnings"
 export CARGO_INCREMENTAL=0
 export CARGO_EXTRA_FLAGS="--all-features"
 
@@ -25,7 +25,7 @@ function run_tests {
   ./miri test --locked
   if ! [ -n "${MIRI_TEST_TARGET+exists}" ]; then
     # Only for host architecture: tests with MIR optimizations
-    MIRI_TEST_FLAGS="-Z mir-opt-level=3" ./miri test --locked
+    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.
@@ -42,9 +42,12 @@ 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=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
+else
+  echo "FATAL: unknown CI platform"
+  exit 1
 fi