bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

run the provenance-gc=1 test on all targets, but only for some of the tests

Browse source 
before: only on Linux host, all tests
after: only the test suite itself (not cargo-miri or the mir-opt-level=4 run),
on all hosts for the host target and on Linux for all "full" targets.
This commit is contained in:
Ralf Jung 2023-11-25 10:11:05 +01:00
parent b7912d38b1
commit 2a89b74bc7
2 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/tools/miri/.github/workflows/ci.yml vendored
View file

@ -35,10 +35,6 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Set the tag GC interval to 1 on linux
if: runner.os == 'Linux'
run: echo "MIRIFLAGS=-Zmiri-provenance-gc=1" >> $GITHUB_ENV
# Cache the global cargo directory, but NOT the local `target` directory which # Cache the global cargo directory, but NOT the local `target` directory which
# we cannot reuse anyway when the nightly changes (and it grows quite large # we cannot reuse anyway when the nightly changes (and it grows quite large
# over time). # over time).

15
src/tools/miri/ci.sh
View file

@ -30,16 +30,23 @@ endgroup
# Test # Test
function run_tests { function run_tests {
if [ -n "${MIRI_TEST_TARGET+exists}" ]; then if [ -n "${MIRI_TEST_TARGET:-}" ]; then
begingroup "Testing foreign architecture $MIRI_TEST_TARGET" begingroup "Testing foreign architecture $MIRI_TEST_TARGET"
else else
begingroup "Testing host architecture" begingroup "Testing host architecture"
fi fi
## ui test suite ## ui test suite
# On the host and on Linux, also stress-test the GC.
if [ -z "${MIRI_TEST_TARGET:-}" ] || [ "$HOST_TARGET" = x86_64-unknown-linux-gnu ]; then
MIRIFLAGS="${MIRIFLAGS:-} -Zmiri-provenance-gc=1" ./miri test
else
./miri test ./miri test
if [ -z "${MIRI_TEST_TARGET+exists}" ]; then fi
# Host-only tests: running these on all targets is unlikely to catch more problems and would
# Host-only tests
if [ -z "${MIRI_TEST_TARGET:-}" ]; then
# Running these on all targets is unlikely to catch more problems and would
# cost a lot of CI time. # cost a lot of CI time.
# Tests with optimizations (`-O` is what cargo passes, but crank MIR optimizations up all the # Tests with optimizations (`-O` is what cargo passes, but crank MIR optimizations up all the
@ -85,7 +92,7 @@ function run_tests {
} }
function run_tests_minimal { function run_tests_minimal {
if [ -n "${MIRI_TEST_TARGET+exists}" ]; then if [ -n "${MIRI_TEST_TARGET:-}" ]; then
begingroup "Testing MINIMAL foreign architecture $MIRI_TEST_TARGET: only testing $@" begingroup "Testing MINIMAL foreign architecture $MIRI_TEST_TARGET: only testing $@"
else else
begingroup "Testing MINIMAL host architecture: only testing $@" begingroup "Testing MINIMAL host architecture: only testing $@"