Index: Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py |
diff --git a/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py b/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py |
index 0803df4c3da9e3ecb6ba714890e6bfdbbdf4fd57..ca1ca97f6925559dc7247b3a9c22b16ce8efe9c3 100644 |
--- a/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py |
+++ b/Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py |
@@ -323,6 +323,9 @@ class SingleTestRunner(object): |
failures.append(test_failures.FailureMissingAudio()) |
return failures |
+ _observatory_cleaner = re.compile(r"^Observatory.*\n", re.MULTILINE) |
+ _console_observatory_cleaner = re.compile(r"^CONSOLE INFO: Observatory.*\n", re.MULTILINE) |
+ |
def _get_normalized_output_text(self, output): |
"""Returns the normalized text output, i.e. the output in which |
the end-of-line characters are normalized to "\n".""" |
@@ -330,7 +333,10 @@ class SingleTestRunner(object): |
# changed to "\r\n" by our system (Python/Cygwin), resulting in |
# "\r\r\n", when, in fact, we wanted to compare the text output with |
# the normalized text expectation files. |
- return output.replace("\r\r\n", "\r\n").replace("\r\n", "\n") |
+ normalized_lines = output.replace("\r\r\n", "\r\n").replace("\r\n", "\n") |
+ normalized_lines = re.sub(self._observatory_cleaner, r"", normalized_lines) |
+ normalized_lines = re.sub(self._console_observatory_cleaner, r"", normalized_lines) |
+ return normalized_lines |
# FIXME: This function also creates the image diff. Maybe that work should |
# be handled elsewhere? |