about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2016-02-24 16:20:21 -0500
committerNiko Matsakis <niko@alum.mit.edu>2016-02-25 03:26:41 -0500
commit588d5d1e3dcb87ff59ff37da16850e9302996b39 (patch)
tree7e3cb4350ad3492236c7514fb4fc2db9a30bf3bd
parent6660ad6f8df0fcbe5120093ec63e0a3e81a54327 (diff)
downloadrust-588d5d1e3dcb87ff59ff37da16850e9302996b39.tar.gz
rust-588d5d1e3dcb87ff59ff37da16850e9302996b39.zip
translate backslashes to forward slashes in the expected strings
-rw-r--r--src/compiletest/runtest.rs4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 1e6e3d3e679..b7a489d9801 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -932,7 +932,9 @@ fn check_expected_errors(expected_errors: Vec<errors::ExpectedError>,
     }
 
     let prefixes = expected_errors.iter().map(|ee| {
-        format!("{}:{}:", testpaths.file.display(), ee.line)
+        let expected = format!("{}:{}:", testpaths.file.display(), ee.line);
+        // On windows just translate all '\' path separators to '/'
+        expected.replace(r"\", "/")
     }).collect::<Vec<String>>();
 
     let (expect_help, expect_note) =