Title: [173514] trunk/Tools
- Revision
- 173514
- Author
- [email protected]
- Date
- 2014-09-11 09:12:02 -0700 (Thu, 11 Sep 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (173513 => 173514)
--- trunk/Tools/ChangeLog 2014-09-11 15:03:42 UTC (rev 173513)
+++ trunk/Tools/ChangeLog 2014-09-11 16:12:02 UTC (rev 173514)
@@ -1,3 +1,16 @@
+2014-09-10 Brent Fulgham <[email protected]>
+
+ 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 <[email protected]>
Added myself as a committer.
Modified: trunk/Tools/Scripts/webkitpy/common/system/executive.py (173513 => 173514)
--- trunk/Tools/Scripts/webkitpy/common/system/executive.py 2014-09-11 15:03:42 UTC (rev 173513)
+++ trunk/Tools/Scripts/webkitpy/common/system/executive.py 2014-09-11 16:12:02 UTC (rev 173514)
@@ -187,7 +187,7 @@
# We only use taskkill.exe on windows (not cygwin) because subprocess.pid
# 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)
return
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
