Auto merge of #25615 - petrochenkov:issue25542, r=alexcrichton

Closes https://github.com/rust-lang/rust/issues/25542

r? @alexcrichton
This commit is contained in:
bors 2015-05-20 12:22:34 +00:00
commit bacd8bc4b7

View file

@ -64,6 +64,10 @@ fn test() {
str::from_utf8(&child_output.stdout).unwrap(),
str::from_utf8(&child_output.stderr).unwrap()));
fs::remove_dir_all(&child_dir).unwrap();
let res = fs::remove_dir_all(&child_dir);
if res.is_err() {
// On Windows deleting just executed mytest.exe can fail because it's still locked
std::thread::sleep_ms(1000);
fs::remove_dir_all(&child_dir).unwrap();
}
}