diff options
| author | bors <bors@rust-lang.org> | 2022-04-05 20:17:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-05 20:17:08 +0000 |
| commit | 306ba8357fb36212b7d30efb9eb9e41659ac1445 (patch) | |
| tree | a5a3748d3ff4d00c458d2c064eee69865c1306df /library/std/src/sync | |
| parent | f262ca12aac76152c4b46cefcf8300f0249a5eb2 (diff) | |
| parent | 650315ee8801e650c049312a899de4202f54a701 (diff) | |
| download | rust-306ba8357fb36212b7d30efb9eb9e41659ac1445.tar.gz rust-306ba8357fb36212b7d30efb9eb9e41659ac1445.zip | |
Auto merge of #95035 - m-ou-se:futex-locks-on-linux, r=Amanieu
Replace Linux Mutex and Condvar with futex based ones. Tracking issue: https://github.com/rust-lang/rust/issues/93740
Diffstat (limited to 'library/std/src/sync')
| -rw-r--r-- | library/std/src/sync/condvar/tests.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sync/condvar/tests.rs b/library/std/src/sync/condvar/tests.rs index 6757707cd95..f7a00676daa 100644 --- a/library/std/src/sync/condvar/tests.rs +++ b/library/std/src/sync/condvar/tests.rs @@ -191,7 +191,7 @@ fn wait_timeout_wake() { #[test] #[should_panic] -#[cfg_attr(not(unix), ignore)] +#[cfg(all(unix, not(target_os = "linux"), not(target_os = "android")))] fn two_mutexes() { let m = Arc::new(Mutex::new(())); let m2 = m.clone(); |