Title: [239928] branches/safari-607-branch/Tools
- Revision
- 239928
- Author
- [email protected]
- Date
- 2019-01-14 10:00:22 -0800 (Mon, 14 Jan 2019)
Log Message
Cherry-pick r239878. rdar://problem/47255372
webkitpy: Support alternate simctl device list output
https://bugs.webkit.org/show_bug.cgi?id=193362
<rdar://problem/47122965>
Reviewed by Lucas Forschler.
* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDeviceManager.populate_available_devices):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@239878 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Tools/ChangeLog (239927 => 239928)
--- branches/safari-607-branch/Tools/ChangeLog 2019-01-14 15:51:41 UTC (rev 239927)
+++ branches/safari-607-branch/Tools/ChangeLog 2019-01-14 18:00:22 UTC (rev 239928)
@@ -1,3 +1,30 @@
+2019-01-14 Ryan Haddad <[email protected]>
+
+ Cherry-pick r239878. rdar://problem/47255372
+
+ webkitpy: Support alternate simctl device list output
+ https://bugs.webkit.org/show_bug.cgi?id=193362
+ <rdar://problem/47122965>
+
+ Reviewed by Lucas Forschler.
+
+ * Scripts/webkitpy/xcode/simulated_device.py:
+ (SimulatedDeviceManager.populate_available_devices):
+
+
+ git-svn-id: http://svn.webkit.org/repository/webkit/trunk@239878 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-11 Jonathan Bedard <[email protected]>
+
+ webkitpy: Support alternate simctl device list output
+ https://bugs.webkit.org/show_bug.cgi?id=193362
+ <rdar://problem/47122965>
+
+ Reviewed by Lucas Forschler.
+
+ * Scripts/webkitpy/xcode/simulated_device.py:
+ (SimulatedDeviceManager.populate_available_devices):
+
2019-01-09 Kocsen Chung <[email protected]>
Cherry-pick r239758. rdar://problem/47158613
Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/xcode/simulated_device.py (239927 => 239928)
--- branches/safari-607-branch/Tools/Scripts/webkitpy/xcode/simulated_device.py 2019-01-14 15:51:41 UTC (rev 239927)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/xcode/simulated_device.py 2019-01-14 18:00:22 UTC (rev 239928)
@@ -131,7 +131,17 @@
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 = []
+ if isinstance(simctl_json['devices'], list):
+ for devices_for_runtime in simctl_json['devices']:
+ if devices_for_runtime['name'] == runtime.name:
+ devices = devices_for_runtime['devices']
+ break
+ else:
+ devices = simctl_json['devices'][runtime.name]
+
+ for device_json in devices:
device = SimulatedDeviceManager._create_device_with_runtime(host, runtime, device_json)
if not device:
continue
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
