Title: [132439] trunk/Tools
- Revision
- 132439
- Author
- [email protected]
- Date
- 2012-10-24 18:44:05 -0700 (Wed, 24 Oct 2012)
Log Message
nrwt: fix a couple of minor crashing issues under cygwin
https://bugs.webkit.org/show_bug.cgi?id=100309
Reviewed by Ojan Vafai.
Cygwin was crashing on a null object reference and then
an oserror in kill().
* Scripts/webkitpy/common/system/executive.py:
(Executive.kill_process):
* Scripts/webkitpy/layout_tests/port/server_process.py:
(ServerProcess.stop):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (132438 => 132439)
--- trunk/Tools/ChangeLog 2012-10-25 01:26:03 UTC (rev 132438)
+++ trunk/Tools/ChangeLog 2012-10-25 01:44:05 UTC (rev 132439)
@@ -1,5 +1,20 @@
2012-10-24 Dirk Pranke <[email protected]>
+ nrwt: fix a couple of minor crashing issues under cygwin
+ https://bugs.webkit.org/show_bug.cgi?id=100309
+
+ Reviewed by Ojan Vafai.
+
+ Cygwin was crashing on a null object reference and then
+ an oserror in kill().
+
+ * Scripts/webkitpy/common/system/executive.py:
+ (Executive.kill_process):
+ * Scripts/webkitpy/layout_tests/port/server_process.py:
+ (ServerProcess.stop):
+
+2012-10-24 Dirk Pranke <[email protected]>
+
nrwt: truncate meter lines properly on windows
https://bugs.webkit.org/show_bug.cgi?id=100062
Modified: trunk/Tools/Scripts/webkitpy/common/system/executive.py (132438 => 132439)
--- trunk/Tools/Scripts/webkitpy/common/system/executive.py 2012-10-25 01:26:03 UTC (rev 132438)
+++ trunk/Tools/Scripts/webkitpy/common/system/executive.py 2012-10-25 01:44:05 UTC (rev 132439)
@@ -215,6 +215,9 @@
if e.errno == errno.ECHILD:
# Can't wait on a non-child process, but the kill worked.
return
+ if e.errno == errno.EACCES and sys.platform == 'cygwin':
+ # Cygwin python sometimes can't kill native processes.
+ return
raise
def _win32_check_running_pid(self, pid):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/server_process.py (132438 => 132439)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/server_process.py 2012-10-25 01:26:03 UTC (rev 132438)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/server_process.py 2012-10-25 01:44:05 UTC (rev 132439)
@@ -331,8 +331,9 @@
self._port.check_for_leaks(self.name(), self.pid())
now = time.time()
- self._proc.stdin.close()
- self._proc.stdin = None
+ if self._proc.stdin:
+ self._proc.stdin.close()
+ self._proc.stdin = None
killed = False
if not timeout_secs:
self._kill()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
