Unrolled build for rust-lang#133200

rust-timer · web-flow · commit b3db772e62b8 · 2024-11-19T14:53:31.000-05:00
Rollup merge of rust-lang#133200 - RalfJung:miri-rwlock-test, r=tgross35 ignore an occasionally-failing test in Miri This is like rust-lang#128640, the test [sometimes](rust-lang#133189) fails due to rust-lang#121950.
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -550,6 +550,9 @@ fn test_downgrade_observe() {`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`#[test]`
	`553`	`+// FIXME: On macOS we use a provenance-incorrect implementation and Miri catches that issue.`
	`554`	`+// See <https://github.com/rust-lang/rust/issues/121950> for details.`
	`555`	`+#[cfg_attr(all(miri, target_os = "macos"), ignore)]`
`553`	`556`	`fn test_downgrade_atomic() {`
`554`	`557`	`const NEW_VALUE: i32 = -1;`
`555`	`558`