Title: [90214] trunk/Tools
Revision
90214
Author
[email protected]
Date
2011-07-01 00:39:34 -0700 (Fri, 01 Jul 2011)

Log Message

2011-07-01  Adam Barth  <[email protected]>

        Exit faster when we get a keyboard interrupt.  Previously, we'd open
        Safari if you ^C NRWT after it found a failure.

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

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (90213 => 90214)


--- trunk/Tools/ChangeLog	2011-07-01 07:31:36 UTC (rev 90213)
+++ trunk/Tools/ChangeLog	2011-07-01 07:39:34 UTC (rev 90214)
@@ -1,3 +1,10 @@
+2011-07-01  Adam Barth  <[email protected]>
+
+        Exit faster when we get a keyboard interrupt.  Previously, we'd open
+        Safari if you ^C NRWT after it found a failure.
+
+        * Scripts/webkitpy/layout_tests/layout_package/manager.py:
+
 2011-07-01  Eric Seidel  <[email protected]>
 
         Reviewed by Adam Barth.

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


--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py	2011-07-01 07:31:36 UTC (rev 90213)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py	2011-07-01 07:39:34 UTC (rev 90214)
@@ -820,6 +820,10 @@
             self._expectations, result_summary, retry_summary, individual_test_timings, _only_unexpected_=True)
         self._printer.print_unexpected_results(unexpected_results)
 
+        # Re-raise a KeyboardInterrupt if necessary so the caller can handle it.
+        if keyboard_interrupted:
+            raise KeyboardInterrupt
+
         # FIXME: remove record_results. It's just used for testing. There's no need
         # for it to be a commandline argument.
         if (self._options.record_results and not self._options.dry_run and
@@ -837,11 +841,6 @@
             if self._options.show_results:
                 self._show_results_html_file(result_summary)
 
-        # Now that we've completed all the processing we can, we re-raise
-        # a KeyboardInterrupt if necessary so the caller can handle it.
-        if keyboard_interrupted:
-            raise KeyboardInterrupt
-
         # Ignore flaky failures and unexpected passes so we don't turn the
         # bot red for those.
         return unexpected_results['num_regressions']
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to