]> git.lizzy.rs Git - rust.git/commitdiff
compiletest: Canonicalize paths when remove incr.comp. dir, enabling longer paths
authorMichael Woerister <michaelwoerister@posteo.net>
Mon, 29 Aug 2016 17:38:09 +0000 (13:38 -0400)
committerMichael Woerister <michaelwoerister@posteo.net>
Mon, 29 Aug 2016 18:27:40 +0000 (14:27 -0400)
src/tools/compiletest/src/runtest.rs

index aa4510746fdc338ae51e327073cbd7f35756dde2..228d6ada01dcc4d1dc3b2d98ac83e7ba44edf54a 100644 (file)
@@ -1976,7 +1976,10 @@ fn init_incremental_test(&self) {
         // runs.
         let incremental_dir = self.incremental_dir();
         if incremental_dir.exists() {
-            fs::remove_dir_all(&incremental_dir).unwrap();
+            // Canonicalizing the path will convert it to the //?/ format
+            // on Windows, which enables paths longer than 260 character
+            let canonicalized = incremental_dir.canonicalize().unwrap();
+            fs::remove_dir_all(canonicalized).unwrap();
         }
         fs::create_dir_all(&incremental_dir).unwrap();