about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMara Bos <m-ou.se@m-ou.se>2020-10-01 01:51:32 +0200
committerMara Bos <m-ou.se@m-ou.se>2020-10-02 09:47:08 +0200
commitb1ce7a38a6c03ddff23ef7e59e74cab6452ed9b0 (patch)
treeeb04e830d71dcef0c400fc62376105587e3c9722
parentf3837e788b8448e9655797bef73ab31dcf985ac1 (diff)
downloadrust-b1ce7a38a6c03ddff23ef7e59e74cab6452ed9b0.tar.gz
rust-b1ce7a38a6c03ddff23ef7e59e74cab6452ed9b0.zip
Disable condvar::two_mutexes test on non-unix platforms.
Condvars are no longer guaranteed to panic in this case on all
platforms. At least the unix implementation still does.
-rw-r--r--library/std/src/sync/condvar/tests.rs2
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 86d099ee3a1..6757707cd95 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(target_os = "emscripten", ignore)]
+#[cfg_attr(not(unix), ignore)]
 fn two_mutexes() {
     let m = Arc::new(Mutex::new(()));
     let m2 = m.clone();