Auto merge of #1284 - vakaras:add-threads-cr2, r=RalfJung

[rust.git] / travis.sh

diff --git a/travis.sh b/travis.sh
index aded53b1579d647cfad2bb2ff894e21aa8d98035..590b94b7f5db29e925ba65391607c92126cff69e 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -1,30 +1,49 @@
 #!/bin/bash
-set -e
+set -euo pipefail
 
 # Determine configuration
-if [ "$TRAVIS_OS_NAME" == osx ]; then
-  export MIRI_SYSROOT_BASE=~/Library/Caches/miri.miri.miri/
-  FOREIGN_TARGET=i686-apple-darwin
-else
-  export MIRI_SYSROOT_BASE=~/.cache/miri/
-  FOREIGN_TARGET=i686-unknown-linux-gnu
-fi
+export CARGO_EXTRA_FLAGS="--all-features"
+export RUSTC_EXTRA_FLAGS="-D warnings"
 
+# Prepare
 echo "Build and install miri"
-cargo build --release --all-features --all-targets
-cargo install --all-features --force --path .
+./miri build --all-targets --locked
+./miri install # implicitly locked
 echo
 
-echo "Get ourselves a MIR-full libstd for the host and a foreign architecture"
-cargo miri setup
-cargo miri setup --target "$FOREIGN_TARGET"
-echo
+# Test
+function run_tests {
+  if [ -n "${MIRI_TEST_TARGET+exists}" ]; then
+    echo "Testing foreign architecture $MIRI_TEST_TARGET"
+  else
+    echo "Testing host architecture"
+  fi
 
-echo "Test miri with full MIR, on the host and other architectures"
-MIRI_SYSROOT="$MIRI_SYSROOT_BASE"/HOST cargo test --release --all-features
-MIRI_SYSROOT="$MIRI_SYSROOT_BASE" MIRI_TARGET="$FOREIGN_TARGET" cargo test --release --all-features
-echo
+  ./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
+  fi
+  # "miri test" has built the sysroot for us, now this should pass without
+  # any interactive questions.
+  test-cargo-miri/run-test.py
 
-echo "Test cargo integration"
-(cd test-cargo-miri && MIRI_SYSROOT="$MIRI_SYSROOT_BASE"/HOST ./run-test.py)
-echo
+  echo
+}
+
+# host
+run_tests
+# cross-test 32bit Linux from everywhere
+MIRI_TEST_TARGET=i686-unknown-linux-gnu run_tests
+
+if [ "$TRAVIS_OS_NAME" == linux ]; then
+  # cross-test 64bit macOS from Linux
+  MIRI_TEST_TARGET=x86_64-apple-darwin run_tests
+  # cross-test 32bit Windows from Linux
+  MIRI_TEST_TARGET=i686-pc-windows-msvc run_tests
+elif [ "$TRAVIS_OS_NAME" == osx ]; then
+  # cross-test 64bit Windows from macOS
+  MIRI_TEST_TARGET=x86_64-pc-windows-msvc run_tests
+  # cross-test 32bit GNU Windows from macOS
+  MIRI_TEST_TARGET=i686-pc-windows-gnu run_tests
+fi