Attachment 368778 Details for Bug 197514 – Patch

[patch] Patch

bug-197514-20190502094244.patch (text/plain), 1.54 KB, created by Jonathan Bedard on 2019-05-02 09:42:44 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2019-05-02 09:42:44 PDT

Size: 1.54 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 244872)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-05-02  Jonathan Bedard  <jbedard@apple.com>
>+
>+        webkitpy: Ignore errors when shutting down an already shutdown simulator
>+        <https://bugs.webkit.org/show_bug.cgi?id=197514>
>+        <rdar://problem/50390247>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/xcode/simulated_device.py:
>+        (SimulatedDevice._shut_down):
>+
> 2019-05-02  Frederic Wang  <fwang@igalia.com>
> 
>         [GTK][WPE] Disable "thin", "thick", "medium" values of mfrac@linethickness at runtime
>Index: Tools/Scripts/webkitpy/xcode/simulated_device.py
>===================================================================
>--- Tools/Scripts/webkitpy/xcode/simulated_device.py	(revision 244872)
>+++ Tools/Scripts/webkitpy/xcode/simulated_device.py	(working copy)
>@@ -544,7 +544,7 @@ class SimulatedDevice(object):
> 
>         # Either shutdown is successful, or the device was already shutdown when we attempted to shut it down.
>         exit_code = self.executive.run_command([SimulatedDeviceManager.xcrun, 'simctl', 'shutdown', self.udid], return_exit_code=True)
>-        if exit_code != 0 and exit_code != 164:
>+        if exit_code != 0 and self.state() != SimulatedDevice.DeviceState.SHUT_DOWN:
>             raise RuntimeError('Failed to shutdown {} with exit code {}'.format(self.udid, exit_code))
> 
>         while self.state(force_update=True) != SimulatedDevice.DeviceState.SHUT_DOWN:

Actions: View | Formatted Diff | Diff

Attachments on bug 197514: 368778