Merge branch 'master' into macos-rand

Author: RalfJung

test-cargo-miri/run-test.py

@@ -5,12 +5,18 @@
 and the working directory to contain the cargo-miri-test project.
 '''
 
-import sys, subprocess
+import sys, subprocess, os
 
 def fail(msg):
     print("TEST FAIL: {}".format(msg))
     sys.exit(1)
 
+def cargo_miri(cmd):
+    args = ["cargo", "miri", cmd, "-q"]
+    if 'MIRI_TEST_TARGET' in os.environ:
+        args += ["--target", os.environ['MIRI_TEST_TARGET']]
+    return args
+
 def test(name, cmd, stdout_ref, stderr_ref):
     print("==> Testing `{}` <==".format(name))
     ## Call `cargo miri`, capture all output
@@ -36,16 +42,22 @@ def test(name, cmd, stdout_ref, stderr_ref):
         fail("stderr does not match reference")
 
 def test_cargo_miri_run():
-    test("cargo miri run", ["cargo", "miri", "run", "-q"], "stdout.ref", "stderr.ref")
+    test("cargo miri run",
+        cargo_miri("run"),
+        "stdout.ref", "stderr.ref"
+    )
     test("cargo miri run (with arguments)",
-        ["cargo", "miri", "run", "-q", "--", "--", "hello world", '"hello world"'],
+        cargo_miri("run") + ["--", "--", "hello world", '"hello world"'],
         "stdout.ref", "stderr.ref2"
     )
 
 def test_cargo_miri_test():
-    test("cargo miri test", ["cargo", "miri", "test", "-q", "--", "-Zmiri-seed=feed"], "test.stdout.ref", "test.stderr.ref")
+    test("cargo miri test",
+        cargo_miri("test") + ["--", "-Zmiri-seed=feed"],
+        "test.stdout.ref", "test.stderr.ref"
+    )
     test("cargo miri test (with filter)",
-        ["cargo", "miri", "test", "-q", "--", "--", "impl"],
+        cargo_miri("test") + ["--", "--", "impl"],
         "test.stdout.ref2", "test.stderr.ref"
     )
 

tests/compiletest.rs

@@ -101,7 +101,7 @@ fn get_host() -> String {
 }
 
 fn get_target() -> String {
-    std::env::var("MIRI_COMPILETEST_TARGET").unwrap_or_else(|_| get_host())
+    std::env::var("MIRI_TEST_TARGET").unwrap_or_else(|_| get_host())
 }
 
 fn run_pass_miri(opt: bool) {

travis.sh

@@ -3,13 +3,14 @@ set -euo pipefail
 
 # Determine configuration
 if [ "$TRAVIS_OS_NAME" == osx ]; then
-  export MIRI_SYSROOT_BASE=~/Library/Caches/miri.miri.miri/
+  MIRI_SYSROOT_BASE=~/Library/Caches/miri.miri.miri/
   FOREIGN_TARGET=i686-apple-darwin
 else
-  export MIRI_SYSROOT_BASE=~/.cache/miri/
+  MIRI_SYSROOT_BASE=~/.cache/miri/
   FOREIGN_TARGET=i686-unknown-linux-gnu
 fi
 
+# Prepare
 echo "Build and install miri"
 cargo build --release --all-features --all-targets
 cargo install --all-features --force --path .
@@ -20,11 +21,18 @@ cargo miri setup
 cargo miri setup --target "$FOREIGN_TARGET"
 echo
 
-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_COMPILETEST_TARGET="$FOREIGN_TARGET" cargo test --release --all-features
+# Test
+function run_tests {
+  cargo test --release --all-features
+  (cd test-cargo-miri && ./run-test.py)
+}
+
+echo "Test host architecture"
+export MIRI_SYSROOT="$MIRI_SYSROOT_BASE"/HOST
+run_tests
 echo
 
-echo "Test cargo integration"
-(cd test-cargo-miri && MIRI_SYSROOT="$MIRI_SYSROOT_BASE"/HOST ./run-test.py)
+echo "Test foreign architecture ($FOREIGN_TARGET)"
+export MIRI_SYSROOT="$MIRI_SYSROOT_BASE" MIRI_TEST_TARGET="$FOREIGN_TARGET"
+run_tests
 echo