Attachment 358939 Details for Bug 193362 – Patch

[patch] Patch

bug-193362-20190111135224.patch (text/plain), 1.91 KB, created by Jonathan Bedard on 2019-01-11 13:52:24 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2019-01-11 13:52:24 PST

Size: 1.91 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 239871)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-01-11  Jonathan Bedard  <jbedard@apple.com>
>+
>+        webkitpy: Support alternate simctl device list output
>+        https://bugs.webkit.org/show_bug.cgi?id=193362
>+        <rdar://problem/47122965>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/xcode/simulated_device.py:
>+        (SimulatedDeviceManager.populate_available_devices):
>+
> 2019-01-11  Joseph Pecoraro  <pecoraro@apple.com>
> 
>         Cleanup possible WK*Copy/Create leaks in WebKitTestRunner
>Index: Tools/Scripts/webkitpy/xcode/simulated_device.py
>===================================================================
>--- Tools/Scripts/webkitpy/xcode/simulated_device.py	(revision 239871)
>+++ Tools/Scripts/webkitpy/xcode/simulated_device.py	(working copy)
>@@ -131,7 +131,17 @@ class SimulatedDeviceManager(object):
>         SimulatedDeviceManager.AVAILABLE_RUNTIMES = SimulatedDeviceManager._create_runtimes(simctl_json['runtimes'])
> 
>         for runtime in SimulatedDeviceManager.AVAILABLE_RUNTIMES:
>-            for device_json in simctl_json['devices'][runtime.name]:
>+            # Needed for <rdar://problem/47122965>
>+            devices_for_runtime = []
>+            if isinstance(simctl_json['devices'], list):
>+                for devices_for_runtime in simctl_json['devices']:
>+                    if devices_for_runtime['name'] == runtime.name:
>+                        devices_for_runtime = devices_for_runtime['devices']
>+                        break
>+            else:
>+                devices_for_runtime = simctl_json['devices'][runtime.name]
>+
>+            for device_json in devices_for_runtime:
>                 device = SimulatedDeviceManager._create_device_with_runtime(host, runtime, device_json)
>                 if not device:
>                     continue

Actions: View | Formatted Diff | Diff

Attachments on bug 193362: 358939 | 358945 | 359074