X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=ci.sh;h=8c63a57a4f490a6727061871ac79bc085ffcb45f;hb=52a6ac96b0a2a270400d75ba9ed3aa829826b5db;hp=e9ebb6f136f4f86210630b53e1e278617eb4322f;hpb=38effb37da1c5bbf95bbfe8c520e7ccfe4bd8285;p=rust.git

diff --git a/ci.sh b/ci.sh
index e9ebb6f136f..8c63a57a4f4 100755
--- a/ci.sh
+++ b/ci.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
 set -euo pipefail
+set -x
 
 # Determine configuration
 export RUSTFLAGS="-D warnings"
@@ -8,8 +9,8 @@ export CARGO_EXTRA_FLAGS="--all-features"
 
 # Prepare
 echo "Build and install miri"
-./miri build --all-targets --locked
 ./miri install # implicitly locked
+./miri build --all-targets --locked # the build that all the `./miri test` below will use
 echo
 
 # Test
@@ -40,6 +41,13 @@ function run_tests {
   # any interactive questions.
   ${PYTHON} test-cargo-miri/run-test.py
   echo
+
+  # Ensure that our benchmarks all work, on the host at least.
+  if [ -z "${MIRI_TEST_TARGET+exists}" ]; then
+    for BENCH in $(ls "bench-cargo-miri"); do
+      cargo miri run --manifest-path bench-cargo-miri/$BENCH/Cargo.toml
+    done
+  fi
 }
 
 function run_tests_minimal {
@@ -60,7 +68,7 @@ case $HOST_TARGET in
     MIRI_TEST_TARGET=i686-unknown-linux-gnu run_tests
     MIRI_TEST_TARGET=aarch64-apple-darwin run_tests
     MIRI_TEST_TARGET=i686-pc-windows-msvc run_tests
-    MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal hello integer vec
+    MIRI_TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal hello integer vec current_dir data_race env
     MIRI_TEST_TARGET=thumbv7em-none-eabihf MIRI_NO_STD=1 run_tests_minimal no_std # no_std embedded architecture
     ;;
   x86_64-apple-darwin)