Modify test driver output so that we report IMAGE, TEXT, and IMAGE+TEXT...

webkit/tools/layout_tests/layout_package/compare_failures.py

 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """A helper class for comparing the failures and crashes from a test run
 against what we expected to happen (as specified in test_expectations.txt)."""
 
 import errno
 import os
 
@@ skipping 78 matching lines @@
                       "Expected to timeout (ignored), but passed",
                       output)
     # Crashes should never be deferred.
     PrintFilesFromSet(passes & self._expectations.GetDeferredFailures(),
                       "Expected to fail (deferred), but passed",
                       output)
     PrintFilesFromSet(passes & self._expectations.GetDeferredTimeouts(),
                       "Expected to timeout (deferred), but passed",
                       output)
     # Print real regressions.
-    PrintFilesFromSet(self._regressed_failures,
-                      "Regressions: Unexpected failures",
+    PrintFilesFromSet(self._regressed_text_failures,
+                      "Regressions: Unexpected text failures",
                       output,
-                      'FAIL')
+                      'TEXT')
+    PrintFilesFromSet(self._regressed_image_failures,
+                      "Regressions: Unexpected image failures",
+                      output,
+                      'IMAGE')
+    PrintFilesFromSet(self._regressed_image_plus_text_failures,
+                      "Regressions: Unexpected image + text failures",
+                      output,
+                      'IMAGE+TEXT')
     PrintFilesFromSet(self._regressed_hangs,
                       "Regressions: Unexpected timeouts",
                       output,
                       'TIMEOUT')
     PrintFilesFromSet(self._regressed_crashes,
                       "Regressions: Unexpected crashes",
                       output,
                       'CRASH')
     PrintFilesFromSet(self._missing,
                       "Missing expected results",
                       output)
 
   def _CalculateRegressions(self):
     """Calculate regressions from this run through the layout tests."""
     worklist = self._test_files.copy()
 
     passes = set()
     crashes = set()
     hangs = set()
     missing = set()
-    failures = set()
+    image_failures = set()
+    text_failures  = set()
+    image_plus_text_failures = set()
 
     for test, failure_type_instances in self._test_failures.iteritems():
       # Although each test can have multiple test_failures, we only put them
       # into one list (either the crash list or the failure list).  We give
       # priority to a crash/timeout over others, and to missing results over
       # a text mismatch.
       failure_types = [type(f) for f in failure_type_instances]
       is_crash = [True for f in failure_types if f in self.CRASH_TYPES]
       is_hang = [True for f in failure_types if f in self.HANG_TYPES]
       is_missing = [True for f in failure_types if f in self.MISSING_TYPES]
@@ skipping 10 matching lines @@
         if not test_expectations.TIMEOUT in expectations: hangs.add(test)
       # Do not add to the missing list if a test is rebaselining and missing
       # expected files.
       elif (is_missing and
             not self._expectations.IsRebaselining(test) and
             not self._expectations.IsIgnored(test)):
         missing.add(test)
       elif is_image_failure and is_text_failure:
         if (not test_expectations.FAIL in expectations and
             not test_expectations.IMAGE_PLUS_TEXT in expectations):
-            failures.add(test)
+            image_plus_text_failures.add(test)
       elif is_image_failure:
         if (not test_expectations.FAIL in expectations and
             not test_expectations.IMAGE in expectations):
-            failures.add(test)
+            image_failures.add(test)
       elif is_text_failure:
         if (not test_expectations.FAIL in expectations and
             not test_expectations.TEXT in expectations):
-            failures.add(test)
+            text_failures.add(test)
       elif is_failure:
         raise ValueError('unexpected failure type:' + f)
       worklist.remove(test)
 
     for test in worklist:
       # Check that all passing tests are expected to pass.
       expectations = self._expectations.GetExpectations(test)
       if not test_expectations.PASS in expectations: passes.add(test)
 
     self._regressed_passes = passes
     self._regressed_crashes = crashes
     self._regressed_hangs = hangs
     self._missing = missing
-    self._regressed_failures = failures
+    self._regressed_image_failures = image_failures
+    self._regressed_text_failures = text_failures
+    self._regressed_image_plus_text_failures = image_plus_text_failures
 
   def GetRegressions(self):
     """Returns a set of regressions from the test expectations. This is
     used to determine which tests to list in results.html and the
     right script exit code for the build bots. The list does not
     include the unexpected passes."""
-    return (self._regressed_failures | self._regressed_hangs |
+    return (self._regressed_text_failures | self._regressed_image_failures |
+            self._regressed_image_plus_text_failures | self._regressed_hangs |
             self._regressed_crashes | self._missing)