Changeset 221011 in webkit

Timestamp:

Aug 22, 2017 8:46:30 AM (7 years ago)

Author:

Jonathan Bedard

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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/server_process.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-08-22  Jonathan Bedard  <jbedard@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  <clopez@igalia.com>
 

trunk/Tools/Scripts/webkitpy/port/server_process.py

@@ -360 +360 @@
         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
@@ -371 +371 @@
 
         # 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)