Skip to content

Commit 5287ca4

Browse files
committed
fix CI by using tree borrows model in miri to avoid failing on stacked borrows violations in crossbeam-epoch
1 parent e893f20 commit 5287ca4

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

miri.sh

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,18 @@ echo "using filter: \"$filter\""
1515
# Miri currently reports leaks in some tests so we disable that check
1616
# here (might be due to ptr-int-ptr in crossbeam-epoch so might be
1717
# resolved in future versions of that crate).
18-
MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-ignore-leaks" \
18+
#
19+
# crossbeam-epoch doesn't pass with stacked borrows so we need to use tree-borrows
20+
# https://github.com/crossbeam-rs/crossbeam/issues/545
21+
MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-ignore-leaks -Zmiri-tree-borrows" \
1922
cargo +nightly miri nextest run \
2023
-E "$filter" \
2124
--test-threads="$test_threads" \
2225
# use nocapture or run miri directly to see warnings from miri
2326
#--nocapture
2427

2528
# Run tests only available when parallel feature is disabled.
26-
MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-ignore-leaks" \
29+
MIRIFLAGS="-Zmiri-disable-isolation -Zmiri-ignore-leaks -Zmiri-tree-borrows" \
2730
cargo +nightly miri nextest run \
2831
--no-default-features \
2932
-E "binary(no_parallel)" \

0 commit comments

Comments
 (0)