about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-07-26 13:51:34 -0700
committerGitHub <noreply@github.com>2016-07-26 13:51:34 -0700
commitfeeca945738ffc6d252ae0fbb2f35723e4eb95a6 (patch)
tree695f6972504c9b51a5fb3d89c3790728304d2614 /src/liballoc
parent9316ae515e2f8f3f497fb4f1559910c1eef2433d (diff)
parent84876662417aab8f90d685cf6bdd9471f2353022 (diff)
downloadrust-feeca945738ffc6d252ae0fbb2f35723e4eb95a6.tar.gz
rust-feeca945738ffc6d252ae0fbb2f35723e4eb95a6.zip
Auto merge of #34983 - alexcrichton:windows-flaky, r=brson
std: Ignore tests where threads outlive main

Long ago we discovered that threads which outlive main and then exit while the
rest of the program is exiting causes Windows to hang (#20704). That's what was
happening in this test so let's just not run this test any more.
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/arc.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs
index e762e4d8ce9..64b780413f8 100644
--- a/src/liballoc/arc.rs
+++ b/src/liballoc/arc.rs
@@ -21,6 +21,10 @@
 //!
 //! Sharing some immutable data between threads:
 //!
+// Note that we **do not** run these tests here. The windows builders get super
+// unhappy of a thread outlives the main thread and then exits at the same time
+// (something deadlocks) so we just avoid this entirely by not running these
+// tests.
 //! ```no_run
 //! use std::sync::Arc;
 //! use std::thread;
@@ -97,7 +101,8 @@ const MAX_REFCOUNT: usize = (isize::MAX) as usize;
 /// by putting it inside `Mutex` and then share `Mutex` immutably
 /// with `Arc<T>` as shown below.
 ///
-/// ```
+// See comment at the top of this file for why the test is no_run
+/// ```no_run
 /// use std::sync::{Arc, Mutex};
 /// use std::thread;
 ///