about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-08-09 00:03:35 +0200
committerGitHub <noreply@github.com>2024-08-09 00:03:35 +0200
commit95b40727bdaa83fbb3bf687ce70640126d017557 (patch)
tree9fc5ae57028e2ed42d99d1d48973824d608fb17c
parent3e9bd8b566a47c5d1c1dbc7e043b4b7fa5330eca (diff)
parenta120fb7031c7ca7636ad3628b9758811e1303d41 (diff)
downloadrust-95b40727bdaa83fbb3bf687ce70640126d017557.tar.gz
rust-95b40727bdaa83fbb3bf687ce70640126d017557.zip
Rollup merge of #128640 - RalfJung:rwlock-macos-miri, r=joboet
rwlock: disable 'frob' test in Miri on macOS

Due to https://github.com/rust-lang/rust/issues/121950, Miri will sometimes complain about this test on macOS. Better disable the test, as otherwise it can fail for unrelated PRs.

r? ``@joboet``
-rw-r--r--library/std/src/sync/rwlock/tests.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/library/std/src/sync/rwlock/tests.rs b/library/std/src/sync/rwlock/tests.rs
index 12bb0fbf050..37a2e41641a 100644
--- a/library/std/src/sync/rwlock/tests.rs
+++ b/library/std/src/sync/rwlock/tests.rs
@@ -21,6 +21,10 @@ fn smoke() {
 }
 
 #[test]
+// FIXME: On macOS we use a provenance-incorrect implementation and Miri
+// catches that issue with a chance of around 1/1000.
+// See <https://github.com/rust-lang/rust/issues/121950> for details.
+#[cfg_attr(all(miri, target_os = "macos"), ignore)]
 fn frob() {
     const N: u32 = 10;
     const M: usize = if cfg!(miri) { 100 } else { 1000 };