Unreviewed build-fix after r212297.
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Feb 2017 17:51:25 +0000 (17:51 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Feb 2017 17:51:25 +0000 (17:51 +0000)
* Scripts/webkitpy/port/simulator_process.py:
(SimulatorProcess.stop): Handle case where there is no process to kill.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@212305 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/port/simulator_process.py

index 1bcd97f..37e56b7 100644 (file)
@@ -1,3 +1,10 @@
+2017-02-14  Jonathan Bedard  <jbedard@apple.com>
+
+        Unreviewed build-fix after r212297.
+
+        * Scripts/webkitpy/port/simulator_process.py:
+        (SimulatorProcess.stop): Handle case where there is no process to kill.
+
 2017-02-14  Carlos Alberto Lopez Perez  <clopez@igalia.com>
 
         [CMake] build-webkit should print the cmake command executed
index 70cd75d..92df183 100644 (file)
@@ -130,5 +130,9 @@ class SimulatorProcess(ServerProcess):
         self._proc = SimulatorProcess.Popen(self._pid, stdin, stdout, stderr)
 
     def stop(self, timeout_secs=3.0):
-        os.kill(self._pid, signal.SIGTERM)
+        try:
+            os.kill(self._pid, signal.SIGTERM)
+        except OSError as err:
+            assert err.errno == errno.ESRCH
+            pass
         super(SimulatorProcess, self).stop(timeout_secs)