diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-02-24 00:28:12 +0530 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-23 11:44:00 -0800 |
| commit | d6d33770da9b831248c782a421d4c9cbd99791ff (patch) | |
| tree | f1edcd2a2e9ac4a729017ca4273dfe8bdb2a13f6 /src | |
| parent | 8eb655b1e6235c7524aaedefaaae4a6e7bcbd508 (diff) | |
| parent | 2408436eb420ea79f4f4ceaa3b72cf3ebdee47ad (diff) | |
| download | rust-d6d33770da9b831248c782a421d4c9cbd99791ff.tar.gz rust-d6d33770da9b831248c782a421d4c9cbd99791ff.zip | |
Rollup merge of #22723 - alexcrichton:less-flaky-windows-test, r=alexcrichton
If these tests exit while a thread is panicking it often leads to situations like #22628.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/run-pass/unwind-resource.rs | 3 | ||||
| -rw-r--r-- | src/test/run-pass/unwind-unique.rs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/run-pass/unwind-resource.rs b/src/test/run-pass/unwind-resource.rs index 52c09aadfbd..449e500edbe 100644 --- a/src/test/run-pass/unwind-resource.rs +++ b/src/test/run-pass/unwind-resource.rs @@ -37,7 +37,8 @@ fn f(tx: Sender<bool>) { pub fn main() { let (tx, rx) = channel(); - let _t = thread::spawn(move|| f(tx.clone())); + let t = thread::spawn(move|| f(tx.clone())); println!("hiiiiiiiii"); assert!(rx.recv().unwrap()); + drop(t.join()); } diff --git a/src/test/run-pass/unwind-unique.rs b/src/test/run-pass/unwind-unique.rs index d38b6e79eba..4d90f71c830 100644 --- a/src/test/run-pass/unwind-unique.rs +++ b/src/test/run-pass/unwind-unique.rs @@ -19,5 +19,6 @@ fn f() { } pub fn main() { - let _t = thread::spawn(f); + let t = thread::spawn(f); + drop(t.join()); } |