Merge pull request rustwasm#116 from userzimmermann/zimmermann/windows

test: Compare expected w/actual outputs line-wise

twiggy/tests/tests.rs

@@ -47,11 +47,13 @@ macro_rules! test {
             let expected = slurp(expected_path).unwrap_or(vec![]);
             let expected = String::from_utf8_lossy(&expected);
             let expected = expected.trim();
+            let expected_lines = expected.lines().collect::<Vec<&str>>();
 
             let actual = String::from_utf8_lossy(&output.stdout);
             let actual = actual.trim();
+            let actual_lines = actual.lines().collect::<Vec<&str>>();
 
-            if actual != expected {
+            if actual_lines != expected_lines {
                 let mut cmd = "twiggy".to_string();
                 $(
                     cmd.push(' ');
@@ -61,7 +63,7 @@ macro_rules! test {
 
                 println!("--- {}", expected_path);
                 println!("+++ actually generated by `{}`", cmd);
-                for diff in diff::lines(&expected, &actual) {
+                for diff in diff::slice(&expected_lines, &actual_lines) {
                     match diff {
                         diff::Result::Left(l) => println!("-{}", l),
                         diff::Result::Both(l, _) => println!(" {}", l),