Include skipped tests statistics when running sharded tests.

webkit/tools/layout_tests/run_webkit_tests.py

 #!/usr/bin/env python
 # Copyright (c) 2006-2009 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.
 
 """Run layout tests using the test_shell.
 
 This is a port of the existing webkit test script run-webkit-tests.
 
 The TestRunner class runs a series of tests (TestType interface) against a set
@@ skipping 241 matching lines @@
     logging.info('Skipped tests do not appear in any of the below numbers\n')
 
     # Create a sorted list of test files so the subset chunk, if used, contains
     # alphabetically consecutive tests.
     self._test_files_list = list(self._test_files)
     if self._options.randomize_order:
       random.shuffle(self._test_files_list)
     else:
       self._test_files_list.sort(self.TestFilesSort)
 
+    # Chunking replaces self._expectations, which loses all the skipped test
+    # information. Keep the prechunk expectations for tracking number of
+    # skipped tests.
+    self.prechunk_expectations = self._expectations;
+
     # If the user specifies they just want to run a subset of the tests,
     # just grab a subset of the non-skipped tests.
     if self._options.run_chunk or self._options.run_part:
       chunk_value = self._options.run_chunk or self._options.run_part
       test_files = self._test_files_list
       try:
         (chunk_num, chunk_len) = chunk_value.split(":")
         chunk_num = int(chunk_num)
         assert(chunk_num >= 0)
         test_size = int(chunk_len)
@@ skipping 544 matching lines @@
         elif self._expectations.IsIgnored(test):
           count_group = wontfix_counts
           failure_group = wontfix_failures
         else:
           count_group = fixable_counts
           failure_group = fixable_failures
 
         AddFailure(count_group, failure.__class__)
         failure_group.add(test)
 
+    # Here and below, use the prechuncked expectations object for numbers of
+    # skipped tests. Chunking removes the skipped tests before creating the
+    # expectations file.
+    #
+    # This is a bit inaccurate, since the number of skipped tests will be
+    # duplicated across all shard, but it's the best we can reasonably do.
+
     deduped_fixable_count = len(fixable_failures |
-        self._expectations.GetFixableSkipped())
+        self.prechunk_expectations.GetFixableSkipped())
     all_fixable_count = len(self._test_files -
         self._expectations.GetWontFix() - self._expectations.GetDeferred())
 
     # Breakdown of tests we need to fix and want to pass.
     # Include skipped fixable tests in the statistics.
     fixable_result_summary = ResultSummaryEntry(
         self._expectations.GetFixable() | fixable_failures,
         fixable_failures,
         fixable_counts,
-        self._expectations.GetFixableSkipped())
+        self.prechunk_expectations.GetFixableSkipped())
 
     deferred_result_summary = ResultSummaryEntry(
         self._expectations.GetDeferred(),
         deferred_failures,
         deferred_counts,
-        self._expectations.GetDeferredSkipped())
+        self.prechunk_expectations.GetDeferredSkipped())
 
     wontfix_result_summary = ResultSummaryEntry(
         self._expectations.GetWontFix(),
         wontfix_failures,
         wontfix_counts,
-        self._expectations.GetWontFixSkipped())
+        self.prechunk_expectations.GetWontFixSkipped())
 
     return ResultSummary(deferred_result_summary, wontfix_result_summary,
         fixable_result_summary, deduped_fixable_count, all_fixable_count)
 
   def _PrintResultSummary(self, result_summary, output):
     """Print a short summary to stdout about how many tests passed.
 
     Args:
       result_summary: ResultSummary object with failure counts.
       output: file descriptor to write the results to. For example, sys.stdout.
@@ skipping 381 matching lines @@
   option_parser.add_option("", "--build-number",
                            default="DUMMY_BUILD_NUMBER",
                            help=("The build number of the builder running"
                                  "this script."))
   option_parser.add_option("", "--find-baselines", action="store_true",
                            default=False,
                            help="Prints a table mapping tests to their "
                                 "expected results")
   options, args = option_parser.parse_args()
   main(options, args)