From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sat, 9 Mar 2019 11:29:55 +0000 (+0300)
Subject: compiletest: Filter away test annotations from UI test output
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=2060d49c39e41a286b0425cb2f7ba6022a2d4b96;p=rust.git

compiletest: Filter away test annotations from UI test output
---

diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
index bac41a7c579..68ecc0527bc 100644
--- a/src/tools/compiletest/src/runtest.rs
+++ b/src/tools/compiletest/src/runtest.rs
@@ -3083,6 +3083,12 @@ fn normalize_output(&self, output: &str, custom_rules: &[(String, String)]) -> S
               .replace("\\", "/") // normalize for paths on windows
               .replace("\r\n", "\n") // normalize for linebreaks on windows
               .replace("\t", "\\t"); // makes tabs visible
+
+        // Remove test annotations like `//~ ERROR text` from the output,
+        // since they duplicate actual errors and make the output hard to read.
+        normalized = Regex::new("\\s*//~.*").unwrap()
+            .replace_all(&normalized, "").into_owned();
+
         for rule in custom_rules {
             let re = Regex::new(&rule.0).expect("bad regex in custom normalization rule");
             normalized = re.replace_all(&normalized, &rule.1[..]).into_owned();