Skip to content

Commit 418ea48

Browse files
authored
Rollup merge of rust-lang#146433 - RalfJung:rwlock-miri, r=tgross35
rwlock tests: fix miri macos test regression rust-lang#144648 broke the attributes that ignore the tests on Miri; this patch should fix that.
2 parents 6557630 + 0928026 commit 418ea48

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

library/std/tests/sync/rwlock.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ nonpoison_and_poison_unwrap_test!(
5050
// FIXME: On macOS we use a provenance-incorrect implementation and Miri
5151
// catches that issue with a chance of around 1/1000.
5252
// See <https://github.com/rust-lang/rust/issues/121950> for details.
53-
#[cfg_attr(all(miri, target_os = "macos"), ignore)]
53+
#[cfg(not(all(miri, target_os = "macos")))]
5454
nonpoison_and_poison_unwrap_test!(
5555
name: frob,
5656
test_body: {
@@ -315,7 +315,7 @@ nonpoison_and_poison_unwrap_test!(
315315

316316
// FIXME: On macOS we use a provenance-incorrect implementation and Miri catches that issue.
317317
// See <https://github.com/rust-lang/rust/issues/121950> for details.
318-
#[cfg_attr(all(miri, target_os = "macos"), ignore)]
318+
#[cfg(not(all(miri, target_os = "macos")))]
319319
nonpoison_and_poison_unwrap_test!(
320320
name: test_downgrade_observe,
321321
test_body: {
@@ -362,7 +362,7 @@ nonpoison_and_poison_unwrap_test!(
362362

363363
// FIXME: On macOS we use a provenance-incorrect implementation and Miri catches that issue.
364364
// See <https://github.com/rust-lang/rust/issues/121950> for details.
365-
#[cfg_attr(all(miri, target_os = "macos"), ignore)]
365+
#[cfg(not(all(miri, target_os = "macos")))]
366366
nonpoison_and_poison_unwrap_test!(
367367
name: test_downgrade_atomic,
368368
test_body: {

0 commit comments

Comments
 (0)