Changeset 173514 in webkit

Timestamp:

Sep 11, 2014, 9:12:02 AM (12 years ago)

Author:

Brent Fulgham

Message:

Blink merge: Speculative fix for windows run-webkit-tests hangs
​https://bugs.webkit.org/show_bug.cgi?id=136727

Reviewed by Csaba Osztrogonác.

Merged from Blink (patch by Dirk Pranke):
<​https://chromium.googlesource.com/chromium/blink/+/0cdd98d44a20c3951562ccf8b08b1fefba8dac67%5E%21/#F0>

• Scripts/webkitpy/common/system/executive.py:

(Executive.kill_process):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/executive.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2014-09-10  Brent Fulgham  <bfulgham@apple.com>
+
+        Blink merge: Speculative fix for windows run-webkit-tests hangs
+        https://bugs.webkit.org/show_bug.cgi?id=136727
+
+        Reviewed by Csaba Osztrogonác.
+
+        Merged from Blink (patch by Dirk Pranke):
+        <https://chromium.googlesource.com/chromium/blink/+/0cdd98d44a20c3951562ccf8b08b1fefba8dac67%5E%21/#F0>
+
+        * Scripts/webkitpy/common/system/executive.py:
+        (Executive.kill_process):
+
 2014-09-11  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
 

trunk/Tools/Scripts/webkitpy/common/system/executive.py

@@ -188 +188 @@
             # is a CYGWIN pid and taskkill.exe expects a windows pid.
             # Thankfully os.kill on CYGWIN handles either pid type.
-            command = ["taskkill.exe", "/f", "/pid", pid]
+            command = ["taskkill.exe", "/f", "/t", "/pid", pid]
             # taskkill will exit 128 if the process is not found.  We should log.
             self.run_command(command, error_handler=self.ignore_error)