about summary refs log tree commit diff
diff options
context:
space:
mode:
authorpetrochenkov <vadim.petrochenkov@gmail.com>2015-05-19 20:37:17 +0300
committerpetrochenkov <vadim.petrochenkov@gmail.com>2015-05-19 20:37:17 +0300
commit9e1f531d536e5fb1a1978959acef079a2c56e748 (patch)
tree22719876b6afe20415ecabf602160c504b6bbf75
parentb301e02f37127da993dd2cf370aa1066d48b042e (diff)
downloadrust-9e1f531d536e5fb1a1978959acef079a2c56e748.tar.gz
rust-9e1f531d536e5fb1a1978959acef079a2c56e748.zip
Fix test run-pass-fulldeps\issue-15149.rs on Windows
-rw-r--r--src/test/run-pass-fulldeps/issue-15149.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/test/run-pass-fulldeps/issue-15149.rs b/src/test/run-pass-fulldeps/issue-15149.rs
index ea7e959a73c..8bc03d148c6 100644
--- a/src/test/run-pass-fulldeps/issue-15149.rs
+++ b/src/test/run-pass-fulldeps/issue-15149.rs
@@ -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();
+    }
 }