user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #23718 - alexcrichton:flaky-test, r=huonw

Browse source 
It's considered an error to access stdout while a process is being shut down, so
tweak this test a bit to actually wait for the child thread to exit.

This was discovered with a recent [snap-mac3 failure](http://buildbot.rust-lang.org/builders/snap3-mac/builds/164/steps/test/logs/stdio)
This commit is contained in:
bors 2015-03-26 02:33:36 +00:00
commit d4ba1caa99
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/test/run-pass/extern-call-deep2.rs
View file

@ -8,10 +8,10 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(std_misc, libc)]
#![feature(libc)]
extern crate libc;
use std::thread::Thread;
use std::thread;
mod rustrt {
extern crate libc;
@ -42,9 +42,9 @@ fn count(n: libc::uintptr_t) -> libc::uintptr_t {
pub fn main() {
// Make sure we're on a task with small Rust stacks (main currently
// has a large stack)
let _t = Thread::spawn(move|| {
thread::scoped(move|| {
let result = count(1000);
println!("result = {}", result);
assert_eq!(result, 1000);
});
}).join();
}