about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2024-11-19 09:19:21 +0100
committerGitHub <noreply@github.com>2024-11-19 09:19:21 +0100
commit9aac15d736ad5a7aecfe90e17542cc85a384d900 (patch)
treebf0dfd47515274cf675e04c191c378034faedf5b
parentf25fee3349ce48481b7721c7177a1a95fe131deb (diff)
parent7931a8ddef674da07d1254c8e1af39c76e311e49 (diff)
downloadrust-9aac15d736ad5a7aecfe90e17542cc85a384d900.tar.gz
rust-9aac15d736ad5a7aecfe90e17542cc85a384d900.zip
Rollup merge of #133200 - RalfJung:miri-rwlock-test, r=tgross35
ignore an occasionally-failing test in Miri

This is like https://github.com/rust-lang/rust/pull/128640, the test [sometimes](https://github.com/rust-lang/rust/pull/133189) fails due to https://github.com/rust-lang/rust/issues/121950.
-rw-r--r--library/std/src/sync/rwlock/tests.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/library/std/src/sync/rwlock/tests.rs b/library/std/src/sync/rwlock/tests.rs
index 02ac1c85b91..29cad4400f1 100644
--- a/library/std/src/sync/rwlock/tests.rs
+++ b/library/std/src/sync/rwlock/tests.rs
@@ -550,6 +550,9 @@ fn test_downgrade_observe() {
 }
 
 #[test]
+// FIXME: On macOS we use a provenance-incorrect implementation and Miri catches that issue.
+// See <https://github.com/rust-lang/rust/issues/121950> for details.
+#[cfg_attr(all(miri, target_os = "macos"), ignore)]
 fn test_downgrade_atomic() {
     const NEW_VALUE: i32 = -1;