From 25cab498a57813f7ec86288694c3424115200ff9 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Fri, 4 May 2018 18:02:57 +0300
Subject: [PATCH] Try to diagnose/fix spurious windows error with better rm -r

---
 tests/testsuite/build_script.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/testsuite/build_script.rs b/tests/testsuite/build_script.rs
index ec68f6cd6..2453f0907 100644
--- a/tests/testsuite/build_script.rs
+++ b/tests/testsuite/build_script.rs
@@ -3,6 +3,7 @@ use std::fs::{self, File};
 use std::io::prelude::*;
 use std::path::PathBuf;
 
+use cargo::util::paths::remove_dir_all;
 use cargotest::{rustc_host, sleep_ms};
 use cargotest::support::{cross_compile, execs, project};
 use cargotest::support::paths::CargoPathExt;
@@ -3809,7 +3810,8 @@ fn rename_with_link_search_path() {
         &root.join("foo.dll.lib"),
         p2.root().join("foo.dll.lib"),
     ));
-    fs::remove_dir_all(p.root()).unwrap();
+    remove_dir_all(p.root())
+        .unwrap();
 
     // Everything should work the first time
     assert_that(p2.cargo("run"), execs().with_status(0));
-- 
2.30.2