Title: [90176] trunk/Tools
Revision
90176
Author
[email protected]
Date
2011-06-30 16:07:15 -0700 (Thu, 30 Jun 2011)

Log Message

2011-06-30  Adam Barth  <[email protected]>

        Reviewed by Dirk Pranke.

        new-run-webkit-tests should stop when I ^C it
        https://bugs.webkit.org/show_bug.cgi?id=63763

        It still doesn't stop fast enough, but at least with this patch it
        doesn't run more tests.

        Also, I tweaked the UI that happens when there's a keyboard interrupt
        to not be amazingly ugly.  There's still a garbage "Te" left on the
        console, but that's a problem for another day.

        * Scripts/webkitpy/layout_tests/layout_package/manager.py:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (90175 => 90176)


--- trunk/Tools/ChangeLog	2011-06-30 23:05:33 UTC (rev 90175)
+++ trunk/Tools/ChangeLog	2011-06-30 23:07:15 UTC (rev 90176)
@@ -1,3 +1,19 @@
+2011-06-30  Adam Barth  <[email protected]>
+
+        Reviewed by Dirk Pranke.
+
+        new-run-webkit-tests should stop when I ^C it
+        https://bugs.webkit.org/show_bug.cgi?id=63763
+
+        It still doesn't stop fast enough, but at least with this patch it
+        doesn't run more tests.
+
+        Also, I tweaked the UI that happens when there's a keyboard interrupt
+        to not be amazingly ugly.  There's still a garbage "Te" left on the
+        console, but that's a problem for another day.
+
+        * Scripts/webkitpy/layout_tests/layout_package/manager.py:
+
 2011-06-30  Adam Roben  <[email protected]>
 
         Make TestFailures never treat a too-many-failures build as a last-passing build for a test

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py (90175 => 90176)


--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py	2011-06-30 23:05:33 UTC (rev 90175)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py	2011-06-30 23:07:15 UTC (rev 90176)
@@ -687,7 +687,7 @@
                         _log.error('Worker %d did not exit in time.' % worker_state.number)
 
         except KeyboardInterrupt:
-            _log.info("Interrupted, exiting")
+            self._printer.print_update('Interrupted, exiting ...')
             self.cancel_workers()
             keyboard_interrupted = True
         except TestRunInterruptedException, e:
@@ -797,8 +797,7 @@
         # we want to treat even a potentially flaky crash as an error.
         failures = self._get_failures(result_summary, include_crashes=False, include_missing=False)
         retry_summary = result_summary
-        while (len(failures) and self._options.retry_failures and
-            not self._retrying and not interrupted):
+        while (len(failures) and self._options.retry_failures and not self._retrying and not interrupted and not keyboard_interrupted):
             _log.info('')
             _log.info("Retrying %d unexpected failure(s) ..." % len(failures))
             _log.info('')
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to