Changeset 280622 in webkit

Timestamp:

Aug 3, 2021, 4:40:10 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[webkitpy] Handle case where no existing simulators are defined
​https://bugs.webkit.org/show_bug.cgi?id=228758
<rdar://problem/81484040>

Reviewed by Ryan Haddad.

• Scripts/webkitpy/xcode/simulated_device.py:

(SimulatedDeviceManager._disambiguate_device_type): If there are no available devices,
find the newest device identifier which matches the requested type.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/xcode/simulated_device.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-08-03  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitpy] Handle case where no existing simulators are defined
+        https://bugs.webkit.org/show_bug.cgi?id=228758
+        <rdar://problem/81484040>
+
+        Reviewed by Ryan Haddad.
+
+        * Scripts/webkitpy/xcode/simulated_device.py:
+        (SimulatedDeviceManager._disambiguate_device_type): If there are no available devices,
+        find the newest device identifier which matches the requested type.
+
 2021-08-03  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/Scripts/webkitpy/xcode/simulated_device.py

@@ -244 +244 @@
         if full_device_type.hardware_type is None:
             # Again, we use the existing devices to determine a legal hardware type
-            for name in SimulatedDeviceManager._device_identifier_to_name.values():
-                type_from_name = DeviceType.from_string(name)
-                if type_from_name == full_device_type:
-                    full_device_type.hardware_type = type_from_name.hardware_type
+            for device in SimulatedDeviceManager.AVAILABLE_DEVICES:
+                if device.device_type == full_device_type:
+                    full_device_type.hardware_type = device.device_type.hardware_type
+                    break
+
+        if not full_device_type.hardware_family or not full_device_type.hardware_type:
+            # If we couldn't define a device with existing devices, pick the newest matching device type
+            for _, type_name in reversed(SimulatedDeviceManager._device_identifier_to_name.items()):
+                candidate = DeviceType.from_string(type_name)
+                if candidate == full_device_type:
+                    full_device_type = candidate
                     break