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.
This commit is contained in:
commit
d6d33770da
2 changed files with 4 additions and 2 deletions
|
@ -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());
|
||||||
}
|
}
|
||||||
|
|
|
@ -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());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue