Tweaks for windows support

Author: dtolnay

test-runner/src/normalize.rs

@@ -13,9 +13,12 @@ pub fn trim<S: AsRef<[u8]>>(output: S) -> String {
 }
 
 pub fn diagnostics(output: Vec<u8>) -> String {
+    let mut from_bytes = String::from_utf8_lossy(&output).to_string();
+    from_bytes = from_bytes.replace("\r\n", "\n");
+
     let mut normalized = String::new();
 
-    for line in String::from_utf8_lossy(&output).to_string().lines() {
+    for line in from_bytes.lines() {
         if keep(line) {
             normalized += line;
             if !normalized.ends_with("\n\n") {
@@ -28,7 +31,7 @@ pub fn diagnostics(output: Vec<u8>) -> String {
 }
 
 fn keep(line: &str) -> bool {
-    if line.trim_start().starts_with("--> ../../") {
+    if line.trim_start().starts_with("--> ../..") {
         return false;
     }
 

test-runner/src/run.rs

@@ -188,7 +188,10 @@ impl Test {
             return Ok(());
         }
 
-        let expected = fs::read_to_string(stderr_path).map_err(Error::ReadStderr)?;
+        let expected = fs::read_to_string(stderr_path)
+            .map_err(Error::ReadStderr)?
+            .replace("\r\n", "\n");
+
         if expected == stderr {
             message::nice();
             Ok(())