webkitpy: Don't run subsequent rounds if interrupted
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Apr 2019 17:14:23 +0000 (17:14 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 5 Apr 2019 17:14:23 +0000 (17:14 +0000)
https://bugs.webkit.org/show_bug.cgi?id=196646

Reviewed by Aakash Jain.

* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager.run): Bail out if interrupted.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@243936 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/layout_tests/controllers/manager.py

index 05544dd..473c42c 100644 (file)
@@ -1,3 +1,13 @@
+2019-04-05  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Don't run subsequent rounds if interrupted
+        https://bugs.webkit.org/show_bug.cgi?id=196646
+
+        Reviewed by Aakash Jain.
+
+        * Scripts/webkitpy/layout_tests/controllers/manager.py:
+        (Manager.run): Bail out if interrupted.
+
 2019-04-05  Sihui Liu  <sihui_liu@apple.com>
 
         Test sessionStorage in PSON private browsing mode
index 57dcee6..4a3607f 100644 (file)
@@ -290,6 +290,10 @@ class Manager(object):
             retry_results = retry_results.merge(temp_retry_results) if retry_results else temp_retry_results
             enabled_pixel_tests_in_retry |= temp_enabled_pixel_tests_in_retry
 
+            if (initial_results and (initial_results.interrupted or initial_results.keyboard_interrupted)) or \
+                    (retry_results and (retry_results.interrupted or retry_results.keyboard_interrupted)):
+                break
+
         # Used for final logging, max_child_processes_for_run is most relevant here.
         self._options.child_processes = max_child_processes_for_run