compiletest: ignore SVG y offset in by-lines comparison

Author: xmakro

src/tools/compiletest/src/runtest.rs

@@ -2299,6 +2299,24 @@ impl<'test> TestCx<'test> {
         self.props.compile_flags.iter().any(|s| s.contains("--color=always"))
     }
 
+    /// Strip the SVG `y` offset and header line so a pure reordering of rows
+    /// under the parallel front-end is not seen as a difference. Non-SVG output
+    /// is returned unchanged.
+    fn normalize_svg_for_line_comparison<'a>(&self, output: &'a str) -> Cow<'a, str> {
+        if !self.force_color_svg() {
+            return Cow::Borrowed(output);
+        }
+        let strip_y = static_regex!(r#"y="\d+px""#);
+        Cow::Owned(
+            output
+                .lines()
+                .skip(1)
+                .map(|line| strip_y.replace_all(line, r#"y="0px""#))
+                .collect::<Vec<_>>()
+                .join("\n"),
+        )
+    }
+
     fn load_compare_outputs(
         &self,
         proc_res: &ProcRes,
@@ -2714,8 +2732,13 @@ impl<'test> TestCx<'test> {
                 (&tmp.0, &tmp.1)
             }
         } else if compare_output_by_lines {
-            let mut actual_lines: Vec<&str> = actual.lines().collect();
-            let mut expected_lines: Vec<&str> = expected.lines().collect();
+            // Compare as a sorted line multiset. For SVG snapshots this strips
+            // the `y` offset first, so a pure reordering of rows under the
+            // parallel front-end is not reported as a difference.
+            let actual_norm = self.normalize_svg_for_line_comparison(actual);
+            let expected_norm = self.normalize_svg_for_line_comparison(expected);
+            let mut actual_lines: Vec<&str> = actual_norm.lines().collect();
+            let mut expected_lines: Vec<&str> = expected_norm.lines().collect();
             actual_lines.sort_unstable();
             expected_lines.sort_unstable();
             if actual_lines == expected_lines {
@@ -2859,7 +2882,10 @@ impl<'test> TestCx<'test> {
         }
 
         if show_diff_by_lines {
-            write!(self.stderr, "{}", diff_by_lines(expected, actual));
+            // Normalize the same way as the by-lines comparison.
+            let expected_norm = self.normalize_svg_for_line_comparison(expected);
+            let actual_norm = self.normalize_svg_for_line_comparison(actual);
+            write!(self.stderr, "{}", diff_by_lines(&expected_norm, &actual_norm));
         }
     }
 

tests/ui/error-emitter/multiline-removal-suggestion.rs

@@ -56,4 +56,3 @@ fn bay() -> Vec<(bool, HashSet<u8>)> {
 		.collect()
 }
 fn main() {}
-//@ ignore-parallel-frontend invalid svg(multiple threads trying to write to the same file)