mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rollup merge of #22723 - alexcrichton:less-flaky-windows-test, r=alexcrichton

Browse source 
If these tests exit while a thread is panicking it often leads to situations
like #22628.
This commit is contained in:
Manish Goregaokar 2015-02-24 00:28:12 +05:30 • committed by Alex Crichton
commit d6d33770da
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/test/run-pass/unwind-resource.rs
View file

@ -37,7 +37,8 @@ fn f(tx: Sender<bool>) {
pub fn main() { pub fn main() {
let (tx, rx) = channel(); let (tx, rx) = channel();
let _t = thread::spawn(move|| f(tx.clone())); let t = thread::spawn(move|| f(tx.clone()));
println!("hiiiiiiiii"); println!("hiiiiiiiii");
assert!(rx.recv().unwrap()); assert!(rx.recv().unwrap());
drop(t.join());
} }

3
src/test/run-pass/unwind-unique.rs
View file

@ -19,5 +19,6 @@ fn f() {
} }
pub fn main() { pub fn main() {
let _t = thread::spawn(f); let t = thread::spawn(f);
drop(t.join());
} }