Add --force option to run all tests, even those marked SKIP. This will mostly...

webkit/tools/layout_tests/run_webkit_tests.py

 #!/bin/env python
 # 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.
 
 """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 151 matching lines @@
         raise err
 
   def _PrepareListsAndPrintOutput(self):
     """Create appropriate subsets of test lists and print test counts.
 
     Create appropriate subsets of self._tests_files in
     self._ignored_failures, self._fixable_failures, and self._fixable_crashes.
     Also remove skipped files from self._test_files, extract a subset of tests
     if desired, and create the sorted self._test_files_list.
     """
-    # Filter and sort out files from the skipped, ignored, and fixable file
-    # lists.
-    saved_test_files = set()
-    if len(self._test_files) == 1:
-      # If there's only one test file, we don't want to skip it, but we do want
-      # to sort it.  So we save it to add back to the list later.
-      saved_test_files = self._test_files
-
     # Remove skipped - both fixable and ignored - files from the
     # top-level list of files to test.
-    skipped = (self._expectations.GetSkipped() |
-               self._expectations.GetWontFixSkipped())
+    skipped = set()
+    # If there was only one test file, we'll run it even if it was skipped.
+    if len(self._test_files) > 1 and not self._options.force:
+      skipped = (self._expectations.GetSkipped() |
+                 self._expectations.GetWontFixSkipped())
+      self._test_files -= skipped
 
-    self._test_files -= skipped
-
-    # If there was only one test file, run the test even if it was skipped.
-    if len(saved_test_files):
-      self._test_files = saved_test_files
-
-    logging.info('Skipped: %d tests' % len(skipped))
+    if self._options.force:
+      logging.info('Skipped: 0 tests (--force)')
+    else:
+      logging.info('Skipped: %d tests' % len(skipped))
     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)
 
@@ skipping 558 matching lines @@
   logging.info("Exit status: %d" % has_new_failures)
   sys.exit(has_new_failures)
 
 if '__main__' == __name__:
   option_parser = optparse.OptionParser()
   option_parser.add_option("", "--no-pixel-tests", action="store_true",
                            default=False,
                            help="disable pixel-to-pixel PNG comparisons")
   option_parser.add_option("", "--fuzzy-pixel-tests", action="store_true",
                            default=False,
-                           help="Also use fuzzy matching to compare pixel test "
-                                "outputs.")
+                           help="Also use fuzzy matching to compare pixel test"
+                                " outputs.")
   option_parser.add_option("", "--results-directory",
                            default="layout-test-results",
                            help="Output results directory source dir,"
                                 " relative to Debug or Release")
   option_parser.add_option("", "--new-baseline", action="store_true",
                            default=False,
                            help="save all generated results as new baselines "
                                 "into the platform directory, overwriting "
                                 "whatever's already there.")
   option_parser.add_option("", "--noshow-results", action="store_true",
                            default=False, help="don't launch the test_shell"
                            " with results after the tests are done")
   option_parser.add_option("", "--full-results-html", action="store_true",
-                           default=False, help="show all failures in"
+                           default=False, help="show all failures in "
                            "results.html, rather than only regressions")
   option_parser.add_option("", "--lint-test-files", action="store_true",
-                           default=False, help="Makes sure the test files"
-                           "parse for all configurations. Does not run any"
+                           default=False, help="Makes sure the test files "
+                           "parse for all configurations. Does not run any "
                            "tests.")
+  option_parser.add_option("", "--force", action="store_true",
+                           default=False,
+                           help="Run all tests, even those marked SKIP in the "
+                                "test list")
   option_parser.add_option("", "--nocompare-failures", action="store_true",
                            default=False,
                            help="Disable comparison to the last test run. "
                                 "When enabled, show stats on how many tests "
                                 "newly pass or fail.")
   option_parser.add_option("", "--num-test-shells",
                            default=1,
                            help="Number of testshells to run in parallel.")
   option_parser.add_option("", "--time-out-ms",
                            default=None,
                            help="Set the timeout for each test")
   option_parser.add_option("", "--run-singly", action="store_true",
                            default=False,
                            help="run a separate test_shell for each test")
   option_parser.add_option("", "--debug", action="store_true", default=False,
                            help="use the debug binary instead of the release "
                                 "binary")
   option_parser.add_option("", "--platform",
                            help="Override the platform for expected results")
   option_parser.add_option("", "--target", default="",
                            help="Set the build target configuration (overrides"
-                                 "--debug)")
+                                 " --debug)")
   # TODO(pamg): Support multiple levels of verbosity, and remove --sources.
   option_parser.add_option("-v", "--verbose", action="store_true",
                            default=False, help="include debug-level logging")
   option_parser.add_option("", "--sources", action="store_true",
                            help="show expected result file path for each test "
                                 "(implies --verbose)")
   option_parser.add_option("", "--startup-dialog", action="store_true",
                            default=False,
                            help="create a dialog on test_shell.exe startup")
   option_parser.add_option("", "--gp-fault-error-box", action="store_true",
                            default=False,
                            help="enable Windows GP fault error box")
   option_parser.add_option("", "--wrapper",
                            help="wrapper command to insert before invocations "
                                 "of test_shell; option is split on whitespace "
                                 "before running.  (example: "
                                 "--wrapper='valgrind --smc-check=all')")
   option_parser.add_option("", "--test-list", action="append",
                            help="read list of tests to run from file",
                            metavar="FILE")
   option_parser.add_option("", "--nocheck-sys-deps", action="store_true",
                            default=False,
                            help="Don't check the system dependencies (themes)")
   option_parser.add_option("", "--randomize-order", action="store_true",
                            default=False,
                            help=("Run tests in random order (useful for "
                                  "tracking down corruption)"))
   option_parser.add_option("", "--run-chunk",
                            default=None,
-                           help=("Run a specified chunk (n:l), the nth of len l"
-                                 ", of the layout tests"))
+                           help=("Run a specified chunk (n:l), the nth of len "
+                                 "l, of the layout tests"))
   option_parser.add_option("", "--run-part",
                            default=None,
-                           help=("Run a specified part (n:l), the nth of lth"
-                                 ", of the layout tests"))
+                           help=("Run a specified part (n:m), the nth of m"
+                                 " parts, of the layout tests"))
   option_parser.add_option("", "--batch-size",
                            default=None,
                            help=("Run a the tests in batches (n), after every "
                                  "n tests, the test shell is relaunched."))
   options, args = option_parser.parse_args()
   main(options, args)