Apply all blink changes between @202695 and tip of trunk

Tools/Scripts/webkitpy/layout_tests/controllers/single_test_runner.py

 # Copyright (C) 2011 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 307 matching lines @@
         failures = []
         if (expected_audio and actual_audio and
             self._port.do_audio_results_differ(expected_audio, actual_audio)):
             failures.append(test_failures.FailureAudioMismatch())
         elif actual_audio and not expected_audio:
             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)
+    _line_number_cleaner = re.compile(r"\(dart:(\w+):\d+\)", re.MULTILINE)
+
+    def _line_number_substitution(self, match):
+        return "(dart:" + match.group(1) + ":xxxx)"
 
     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"."""
         # Running tests on Windows produces "\r\n".  The "\n" part is helpfully
         # 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.
         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)
+        normalized_lines = re.sub(self._line_number_cleaner, self._line_number_substitution, normalized_lines)
         return normalized_lines
 
     # FIXME: This function also creates the image diff. Maybe that work should
     # be handled elsewhere?
     def _compare_image(self, expected_driver_output, driver_output):
         failures = []
         # If we didn't produce a hash file, this test must be text-only.
         if driver_output.image_hash is None:
             return failures
         if not expected_driver_output.image:
@@ skipping 87 matching lines @@
         elif reference_driver_output.image_hash != actual_driver_output.image_hash:
             diff, err_str = self._port.diff_image(reference_driver_output.image, actual_driver_output.image)
             if diff:
                 failures.append(test_failures.FailureReftestMismatch(reference_filename))
             elif err_str:
                 _log.error(err_str)
             else:
                 _log.warning("  %s -> ref test hashes didn't match but diff passed" % self._test_name)
 
         return TestResult(self._test_name, failures, total_test_time, has_stderr, pid=actual_driver_output.pid)