Add --sanitizer-mode to run-webkit-tests

Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

 # Copyright (C) 2010 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 866 matching lines @@
         drop any pixel failures and return the remaining expectations. For example,
         if we're not running pixel tests, then tests expected to fail as IMAGE
         will PASS."""
         expected_results = expected_results.copy()
         if IMAGE in expected_results:
             expected_results.remove(IMAGE)
             expected_results.add(PASS)
         return expected_results
 
     @staticmethod
+    def remove_non_sanitizer_failures(expected_results):
+        """Returns a copy of the expected results for a test, except that we
+        drop any failures that the sanitizers don't care about."""
+        expected_results = expected_results.copy()
+        for result in (IMAGE, FAIL, IMAGE_PLUS_TEXT):
+            if result in expected_results:
+                expected_results.remove(result)
+                expected_results.add(PASS)
+        return expected_results
+
+    @staticmethod
     def has_pixel_failures(actual_results):
         return IMAGE in actual_results or FAIL in actual_results
 
     @staticmethod
     def suffixes_for_expectations(expectations):
         suffixes = set()
         if IMAGE in expectations:
             suffixes.add('png')
         if FAIL in expectations:
             suffixes.add('txt')
@@ skipping 83 matching lines @@
     # FIXME: Change the callsites to use TestExpectationsModel and remove.
     def get_tests_with_timeline(self, timeline):
         return self._model.get_tests_with_timeline(timeline)
 
     def get_expectations_string(self, test):
         return self._model.get_expectations_string(test)
 
     def expectation_to_string(self, expectation):
         return self._model.expectation_to_string(expectation)
 
-    def matches_an_expected_result(self, test, result, pixel_tests_are_enabled):
+    def matches_an_expected_result(self, test, result, pixel_tests_are_enabled, sanitizer_is_enabled):
         expected_results = self._model.get_expectations(test)
-        if not pixel_tests_are_enabled:
+        if sanitizer_is_enabled:
+            expected_results = self.remove_non_sanitizer_failures(expected_results)
+        elif not pixel_tests_are_enabled:
             expected_results = self.remove_pixel_failures(expected_results)
         return self.result_was_expected(result, expected_results, self.is_rebaselining(test))
 
     def is_rebaselining(self, test):
         return REBASELINE in self._model.get_expectations(test)
 
     def _shorten_filename(self, filename):
         if filename.startswith(self._port.path_from_webkit_base()):
             return self._port.host.filesystem.relpath(filename, self._port.path_from_webkit_base())
         return filename
@@ skipping 101 matching lines @@
             # If reconstitute_only_these is an empty list, we want to return original_string.
             # So we need to compare reconstitute_only_these to None, not just check if it's falsey.
             if reconstitute_only_these is None or expectation_line in reconstitute_only_these:
                 return expectation_line.to_string(test_configuration_converter)
             return expectation_line.original_string
 
         def nones_out(expectation_line):
             return expectation_line is not None
 
         return "\n".join(filter(nones_out, map(serialize, expectation_lines)))