Changeset 58183 in webkit

Timestamp:

Apr 23, 2010 12:43:12 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-04-19 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Adam Barth.

new-run-webkit-tests: add a "--retry-failures" flag and a
"--no-retry-failures" flag (the former is the default). Also, rename
"--print-unexpected-results" and "--retry-unexpected-results" to
"--print-last-failures" and "--retry-last-failures" because the
retry flag was confusing. The new flag names aren't great, but
hopefully they're less confusing.

​https://bugs.webkit.org/show_bug.cgi?id=37838

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (7 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-19  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        new-run-webkit-tests: add a "--retry-failures" flag and a
+        "--no-retry-failures" flag (the former is the default). Also, rename
+        "--print-unexpected-results" and "--retry-unexpected-results" to
+        "--print-last-failures" and "--retry-last-failures" because the
+        retry flag was confusing. The new flag names aren't great, but
+        hopefully they're less confusing.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37838
+
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+
 2010-04-22  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -205 +205 @@
     DEFAULT_TEST_TIMEOUT_MS = 6 * 1000
 
-    NUM_RETRY_ON_UNEXPECTED_FAILURE = 1
-
     def __init__(self, port, options, meter):
         """Initialize test runner data structures.
@@ -237 +235 @@
         self._current_test_number = 0
 
-        self._retries = 0
+        self._retrying = False
 
         # Hack for dumping threads on the bots
@@ -718 +716 @@
         failures = self._get_failures(result_summary, include_crashes=False)
         retry_summary = result_summary
-        while (self._retries < self.NUM_RETRY_ON_UNEXPECTED_FAILURE and
-               len(failures)):
+        while (len(failures) and self._options.retry_failures and
+            not self._retrying):
             _log.info('')
-            _log.info("Retrying %d unexpected failure(s)" % len(failures))
+            _log.info("Retrying %d unexpected failure(s) ..." % len(failures))
             _log.info('')
-            self._retries += 1
+            self._retrying = True
             retry_summary = ResultSummary(self._expectations, failures.keys())
             self._run_tests(failures.keys(), retry_summary)
@@ -836 +834 @@
             result_summary.unexpected) / result_summary.total
         action = "Testing"
-        if self._retries > 0:
+        if self._retrying:
             action = "Retrying"
         self._meter.progress("%s (%d%%): %d ran as expected, %d didn't,"
@@ -1545 +1543 @@
 
     last_unexpected_results = []
-    if options.print_unexpected_results or options.retry_unexpected_results:
+    if options.print_last_failures or options.retest_last_failures:
         unexpected_results_filename = os.path.join(
            options.results_directory, "unexpected_results.json")
@@ -1551 +1549 @@
             results = simplejson.load(file)
         last_unexpected_results = results['tests'].keys()
-        if options.print_unexpected_results:
+        if options.print_last_failures:
             print "\n".join(last_unexpected_results) + "\n"
             return 0
@@ -1855 +1853 @@
         # FIXME: consider: --iterations n
         #      Number of times to run the set of tests (e.g. ABCABCABC)
-        optparse.make_option("--print-unexpected-results", action="store_true",
-            default=False, help="print the tests in the last run that "
-            "had unexpected results."),
-        optparse.make_option("--retry-unexpected-results", action="store_true",
-            default=False, help="re-try the tests in the last run that "
-            "had unexpected results."),
+        optparse.make_option("--print-last-failures", action="store_true",
+            default=False, help="Print the tests in the last run that "
+            "had unexpected failures (or passes)."),
+        optparse.make_option("--retest-last-failures", action="store_true",
+            default=False, help="re-test the tests in the last run that "
+            "had unexpected failures (or passes)."),
+        optparse.make_option("--retry-failures", action="store_true",
+            default=True,
+            help="Re-try any tests that produce unexpected results (default)"),
+        optparse.make_option("--no-retry-failures", action="store_false",
+            dest="retry_failures",
+            help="Don't re-try any tests that produce unexpected results."),
     ]