Title: [221011] trunk/Tools
- Revision
- 221011
- Author
- jbed...@apple.com
- Date
- 2017-08-22 08:46:30 -0700 (Tue, 22 Aug 2017)
Log Message
Fix leak-checking for iOS Simulators
https://bugs.webkit.org/show_bug.cgi?id=175735
Reviewed by David Kilzer.
Follow-up fix to r220942. _proc may be undefined.
* Scripts/webkitpy/port/server_process.py:
(ServerProcess._wait_for_stop): Handle case where _proc is undefined.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (221010 => 221011)
--- trunk/Tools/ChangeLog 2017-08-22 13:47:05 UTC (rev 221010)
+++ trunk/Tools/ChangeLog 2017-08-22 15:46:30 UTC (rev 221011)
@@ -1,3 +1,15 @@
+2017-08-22 Jonathan Bedard <jbed...@apple.com>
+
+ Fix leak-checking for iOS Simulators
+ https://bugs.webkit.org/show_bug.cgi?id=175735
+
+ Reviewed by David Kilzer.
+
+ Follow-up fix to r220942. _proc may be undefined.
+
+ * Scripts/webkitpy/port/server_process.py:
+ (ServerProcess._wait_for_stop): Handle case where _proc is undefined.
+
2017-08-22 Carlos Alberto Lopez Perez <clo...@igalia.com>
[GTK][WPE] install-dependencies should install the required gstreamer packages needed for production builds.
Modified: trunk/Tools/Scripts/webkitpy/port/server_process.py (221010 => 221011)
--- trunk/Tools/Scripts/webkitpy/port/server_process.py 2017-08-22 13:47:05 UTC (rev 221010)
+++ trunk/Tools/Scripts/webkitpy/port/server_process.py 2017-08-22 15:46:30 UTC (rev 221011)
@@ -359,18 +359,18 @@
killed = False
if timeout_secs:
deadline = now + timeout_secs
- while self._proc.poll() is None and time.time() < deadline:
+ while self._proc and self._proc.poll() is None and time.time() < deadline:
time.sleep(0.01)
- if self._proc.poll() is None:
+ if self._proc and self._proc.poll() is None:
_log.warning('stopping %s(pid %d) timed out, killing it' % (self._name, self._proc.pid))
- if self._proc.poll() is None:
+ if self._proc and self._proc.poll() is None:
self._kill()
killed = True
_log.debug('killed pid %d' % self._proc.pid)
# read any remaining data on the pipes and return it.
- if not killed:
+ if self._proc and not killed:
if self._use_win32_apis:
self._wait_for_data_and_update_buffers_using_win32_apis(now)
else:
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
