Changeset 239941 in webkit


Ignore:
Timestamp:
Jan 14, 2019 1:35:39 PM (5 years ago)
Author:
Ryan Haddad
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

Location:
branches/safari-607-branch/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-607-branch/Tools/ChangeLog

    r239928 r239941  
     12019-01-14  Ryan Haddad  <ryanhaddad@apple.com>
     2
     3        Cherry-pick r239939. rdar://problem/47255372
     4
     5    webkitpy: Support alternate simctl device list output (Follow-up fix)
     6    https://bugs.webkit.org/show_bug.cgi?id=193362
     7    <rdar://problem/47122965>
     8   
     9    Rubber-stamped by Lucas Forschler.
     10   
     11    * Scripts/webkitpy/xcode/simulated_device.py:
     12    (SimulatedDeviceManager.populate_available_devices):
     13   
     14   
     15    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@239939 268f45cc-cd09-0410-ab3c-d52691b4dbfc
     16
     17    2019-01-14  Jonathan Bedard  <jbedard@apple.com>
     18
     19            webkitpy: Support alternate simctl device list output (Follow-up fix)
     20            https://bugs.webkit.org/show_bug.cgi?id=193362
     21            <rdar://problem/47122965>
     22
     23            Rubber-stamped by Lucas Forschler.
     24
     25            * Scripts/webkitpy/xcode/simulated_device.py:
     26            (SimulatedDeviceManager.populate_available_devices):
     27
    1282019-01-14  Ryan Haddad  <ryanhaddad@apple.com>
    229

  • branches/safari-607-branch/Tools/Scripts/webkitpy/xcode/simulated_device.py

    r239928 r239941  
    140140                        break
    141141            else:
    142                 devices = simctl_json['devices'][runtime.name]
     142                devices = simctl_json['devices'].get(runtime.name, None) or simctl_json['devices'].get(runtime.identifier, [])
    143143
    144144            for device_json in devices:
Note: See TracChangeset for help on using the changeset viewer.