Title: [239941] branches/safari-607-branch/Tools
- Revision
- 239941
- Author
- [email protected]
- Date
- 2019-01-14 13:35:39 -0800 (Mon, 14 Jan 2019)
Log Message
Cherry-pick r239939. rdar://problem/47255372
webkitpy: Support alternate simctl device list output (Follow-up fix)
https://bugs.webkit.org/show_bug.cgi?id=193362
<rdar://problem/47122965>
Rubber-stamped by Lucas Forschler.
* Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDeviceManager.populate_available_devices):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@239939 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/Tools/ChangeLog (239940 => 239941)
--- branches/safari-607-branch/Tools/ChangeLog 2019-01-14 21:34:47 UTC (rev 239940)
+++ branches/safari-607-branch/Tools/ChangeLog 2019-01-14 21:35:39 UTC (rev 239941)
@@ -1,5 +1,32 @@
2019-01-14 Ryan Haddad <[email protected]>
+ Cherry-pick r239939. rdar://problem/47255372
+
+ webkitpy: Support alternate simctl device list output (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=193362
+ <rdar://problem/47122965>
+
+ Rubber-stamped by Lucas Forschler.
+
+ * Scripts/webkitpy/xcode/simulated_device.py:
+ (SimulatedDeviceManager.populate_available_devices):
+
+
+ git-svn-id: http://svn.webkit.org/repository/webkit/trunk@239939 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-14 Jonathan Bedard <[email protected]>
+
+ webkitpy: Support alternate simctl device list output (Follow-up fix)
+ https://bugs.webkit.org/show_bug.cgi?id=193362
+ <rdar://problem/47122965>
+
+ Rubber-stamped by Lucas Forschler.
+
+ * Scripts/webkitpy/xcode/simulated_device.py:
+ (SimulatedDeviceManager.populate_available_devices):
+
+2019-01-14 Ryan Haddad <[email protected]>
+
Cherry-pick r239878. rdar://problem/47255372
webkitpy: Support alternate simctl device list output
Modified: branches/safari-607-branch/Tools/Scripts/webkitpy/xcode/simulated_device.py (239940 => 239941)
--- branches/safari-607-branch/Tools/Scripts/webkitpy/xcode/simulated_device.py 2019-01-14 21:34:47 UTC (rev 239940)
+++ branches/safari-607-branch/Tools/Scripts/webkitpy/xcode/simulated_device.py 2019-01-14 21:35:39 UTC (rev 239941)
@@ -139,7 +139,7 @@
devices = devices_for_runtime['devices']
break
else:
- devices = simctl_json['devices'][runtime.name]
+ devices = simctl_json['devices'].get(runtime.name, None) or simctl_json['devices'].get(runtime.identifier, [])
for device_json in devices:
device = SimulatedDeviceManager._create_device_with_runtime(host, runtime, device_json)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
