* Handle deferred tests while printing tests summary.

Review URL: http://codereview.chromium.org/16596

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7700 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 14 insertions, 6 deletions

diff --git a/webkit/tools/layout_tests/layout_package/test_expectations.py b/webkit/tools/layout_tests/layout_package/test_expectations.py
index 3a42008..28dade7 100644
--- a/webkit/tools/layout_tests/layout_package/test_expectations.py
+++ b/webkit/tools/layout_tests/layout_package/test_expectations.py
@@ -89,6 +89,10 @@ class TestExpectations:
     # we expect it to pass (and nothing else).
     return set([PASS])
 
+  def IsDeferred(self, test):
+    return (test in self._fixable.GetSkippedDeferred() or
+            test in self._fixable.GetNonSkippedDeferred())
+
   def IsFixable(self, test):
     return (self._fixable.Contains(test) and
             test not in self._fixable.GetNonSkippedDeferred())
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index 5e330a5..49a82b0 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -429,12 +429,16 @@ class TestRunner:
     for test, failures in test_failures.iteritems():
       for failure in failures:
         AddFailure(failure_counts, failure.__class__)
-        if self._expectations.IsFixable(test):
-          AddFailure(fixable_counts, failure.__class__)
-          fixable_failures.add(test)
-        if not self._expectations.IsIgnored(test):
-          AddFailure(non_ignored_counts, failure.__class__)
-          non_ignored_failures.add(test)
+        if self._expectations.IsDeferred(test):
+          AddFailure(deferred_counts, failure.__class__)
+          deferred_failures.add(test)
+        else:
+          if self._expectations.IsFixable(test):
+            AddFailure(fixable_counts, failure.__class__)
+            fixable_failures.add(test)
+          if not self._expectations.IsIgnored(test):
+            AddFailure(non_ignored_counts, failure.__class__)
+            non_ignored_failures.add(test)
 
     # Print breakdown of tests we need to fix and want to pass.
     # Include skipped fixable tests in the statistics.