Skip to content

Commit 97e45e0

Browse files
committed
make optimized-test-run a bit more like what cargo does
1 parent 7acf80d commit 97e45e0

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

ci.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ function run_tests {
2424

2525
./miri test --locked
2626
if [ -z "${MIRI_TEST_TARGET+exists}" ]; then
27-
# Only for host architecture: tests with MIR optimizations
28-
MIRIFLAGS="-Z mir-opt-level=3" ./miri test --locked
27+
# Only for host architecture: tests with optimizations (`-O` is what cargo passes, but crank MIR
28+
# optimizations up all the way).
29+
MIRIFLAGS="-O -Zmir-opt-level=3" ./miri test --locked
2930
fi
3031

3132
# On Windows, there is always "python", not "python3" or "python2".

tests/compile-fail/data_race/dealloc_read_race_stack.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// ignore-windows: Concurrency on Windows is not supported yet.
2-
// compile-flags: -Zmiri-disable-isolation -Zmir-opt-level=0
3-
// With optimizations (in particular #78360), the span becomes much worse, so we disable them.
2+
// compile-flags: -Zmiri-disable-isolation
43

54
use std::thread::{spawn, sleep};
65
use std::ptr::null_mut;

tests/compile-fail/data_race/dealloc_write_race_stack.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// ignore-windows: Concurrency on Windows is not supported yet.
2-
// compile-flags: -Zmiri-disable-isolation -Zmir-opt-level=0
3-
// With optimizations (in particular #78360), the span becomes much worse, so we disable them.
2+
// compile-flags: -Zmiri-disable-isolation
43

54
use std::thread::{spawn, sleep};
65
use std::ptr::null_mut;

0 commit comments

Comments
 (0)