Only enable selected features when testing miri in CI

Author: Stypox

Cargo.toml

@@ -65,6 +65,8 @@ harness = false
 
 [features]
 default = ["stack-cache"]
+# when adding a new feature that is relevant for some tests,
+# make sure to add it to the FEATURES variable in `ci/ci.sh`
 genmc = []
 stack-cache = []
 stack-cache-consistency-check = ["stack-cache"]

ci/ci.sh

@@ -34,10 +34,10 @@ echo "Installing release version of Miri"
 time ./miri install
 
 # Prepare debug build for direct `./miri` invocations.
-# We enable all features to make sure the Stacked Borrows consistency check runs.
+# We enable all features (except tracing) to make sure the Stacked Borrows consistency check runs.
 echo "Building debug version of Miri"
-export CARGO_EXTRA_FLAGS="$CARGO_EXTRA_FLAGS --all-features"
-time ./miri build # the build that all the `./miri test` below will use
+FEATURES="--feature=genmc,stack-cache,stack-cache-consistency-check"
+time ./miri build "$FEATURES" # the build that all the `./miri test` below will use
 
 endgroup
 
@@ -61,9 +61,9 @@ function run_tests {
 
   ## ui test suite
   if [ -n "${GC_STRESS-}" ]; then
-    time MIRIFLAGS="${MIRIFLAGS-} -Zmiri-provenance-gc=1" ./miri test $TARGET_FLAG
+    time MIRIFLAGS="${MIRIFLAGS-} -Zmiri-provenance-gc=1" ./miri test "$FEATURES" $TARGET_FLAG
   else
-    time ./miri test $TARGET_FLAG
+    time ./miri test "$FEATURES" $TARGET_FLAG
   fi
 
   ## advanced tests
@@ -74,20 +74,20 @@ function run_tests {
     # them. Also error locations change so we don't run the failing tests.
     # We explicitly enable debug-assertions here, they are disabled by -O but we have tests
     # which exist to check that we panic on debug assertion failures.
-    time MIRIFLAGS="${MIRIFLAGS-} -O -Zmir-opt-level=4 -Cdebug-assertions=yes" MIRI_SKIP_UI_CHECKS=1 ./miri test $TARGET_FLAG tests/{pass,panic}
+    time MIRIFLAGS="${MIRIFLAGS-} -O -Zmir-opt-level=4 -Cdebug-assertions=yes" MIRI_SKIP_UI_CHECKS=1 ./miri test "$FEATURES" $TARGET_FLAG tests/{pass,panic}
   fi
   if [ -n "${MANY_SEEDS-}" ]; then
     # Run many-seeds tests. (Also tests `./miri run`.)
     time for FILE in tests/many-seeds/*.rs; do
-      ./miri run "-Zmiri-many-seeds=0..$MANY_SEEDS" $TARGET_FLAG "$FILE"
+      ./miri run "$FEATURES" $TARGET_FLAG "-Zmiri-many-seeds=0..$MANY_SEEDS" "$FILE"
     done
   fi
   if [ -n "${TEST_BENCH-}" ]; then
     # Check that the benchmarks build and run, but only once.
-    time HYPERFINE="hyperfine -w0 -r1 --show-output" ./miri bench $TARGET_FLAG --no-install
+    time HYPERFINE="hyperfine -w0 -r1 --show-output" ./miri bench "$FEATURES" $TARGET_FLAG --no-install
   fi
   # Smoke-test `./miri run --dep`.
-  ./miri run $TARGET_FLAG --dep tests/pass-dep/getrandom.rs
+  ./miri run "$FEATURES" $TARGET_FLAG --dep tests/pass-dep/getrandom.rs
 
   ## test-cargo-miri
   # On Windows, there is always "python", not "python3" or "python2".
@@ -125,7 +125,7 @@ function run_tests_minimal {
     exit 1
   fi
 
-  time ./miri test $TARGET_FLAG "$@"
+  time ./miri test "$FEATURES" $TARGET_FLAG "$@"
 
   # Ensure that a small smoke test of cargo-miri works.
   time cargo miri run --manifest-path test-cargo-miri/no-std-smoke/Cargo.toml $TARGET_FLAG