Skip to content

Commit

Permalink
[webkitpy] Remove build version requirement for simulated device match.
Browse files Browse the repository at this point in the history
https://bugs.webkit.org/show_bug.cgi?id=273515
rdar://127187171

Reviewed by Sam Sneddon.

My recent changes in 277884@main fixed a bug where the wrong type of device was being
booted when running tests in OS simulators. As part of those changes, I added a check
to verify that the build versions matched the request. This caused run-webkit-tests to
not use mounted runtimes, even if the simulator was already booted.

This PR removes the heuristics that check if the device is using the same build version
as default, and instead only checks for device type matching the request.

* Tools/Scripts/webkitpy/xcode/simulated_device.py:
(SimulatedDeviceManager._create_or_find_device_for_request): Remove build_version check.

Canonical link: https://commits.webkit.org/278414@main
  • Loading branch information
bls1999 committed May 6, 2024
1 parent 803a4e0 commit 35339e7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Tools/Scripts/webkitpy/xcode/simulated_device.py
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ def _create_or_find_device_for_request(cls, request, host=None, name_base='Manag
assert device_identifier is not None

for device in cls.available_devices(host):
if device.platform_device.name == name and device.platform_device.device_type == device_type and device.platform_device.build_version == runtime.build_version:
if device.platform_device.name == name and device.platform_device.device_type == device_type:
device.platform_device._delete()
break

Expand All @@ -307,7 +307,7 @@ def _create_or_find_device_for_request(cls, request, host=None, name_base='Manag
# We just added a device, so our list of _available_devices needs to be re-synced.
cls.populate_available_devices(host)
for device in cls.available_devices(host):
if device.platform_device.name == name and device.platform_device.device_type == device_type and device.platform_device.build_version == runtime.build_version:
if device.platform_device.name == name and device.platform_device.device_type == device_type:
device.platform_device.managed_by_script = True
return device
return None
Expand Down

0 comments on commit 35339e7

Please sign in to comment.