Make TestAppleSimulatorOSType.py more flexible

Different versions of Xcode have different outputs for the simctl command

llvm-svn: 347117
This commit is contained in:
Frederic Riss
2018-11-17 00:40:31 +00:00
parent c265e7673d
commit f7c101b653

View File

@@ -19,7 +19,13 @@ class TestAppleSimulatorOSType(gdbremote_testcase.GdbRemoteTestCaseBase):
sim_devices = json.loads(sim_devices_str)['devices']
# Find an available simulator for the requested platform
deviceUDID = None
for (runtime,devices) in sim_devices.items():
for simulator in sim_devices:
if isinstance(simulator,dict):
runtime = simulator['name']
devices = simulator['devices']
else:
runtime = simulator
devices = sim_devices[simulator]
if not platform in runtime.lower():
continue
for device in devices: