[lldb/test] Fix TestAppleSimulatorOSType when multiple runtimes are installed

One can have multiple simulator runtimes installed, supporting
various generations of OSs. The logic in TestAppleSimulatorOSType
might select a rnutime older than the one targeted by the current
tools, preventing the executable from running. This commit changes
the test to look for the most recent runtime available instead.
This commit is contained in:
Fred Riss 2020-05-29 08:29:11 -07:00
parent 68c50708d1
commit 977f00123a
1 changed files with 5 additions and 2 deletions

View File

@ -18,6 +18,7 @@ class TestAppleSimulatorOSType(gdbremote_testcase.GdbRemoteTestCaseBase):
sim_devices = json.loads(sim_devices_str)['devices']
# Find an available simulator for the requested platform
deviceUDID = None
deviceRuntime = None
for simulator in sim_devices:
if isinstance(simulator,dict):
runtime = simulator['name']
@ -32,9 +33,11 @@ class TestAppleSimulatorOSType(gdbremote_testcase.GdbRemoteTestCaseBase):
continue
if 'isAvailable' in device and device['isAvailable'] != True:
continue
if deviceRuntime and runtime < deviceRuntime:
continue
deviceUDID = device['udid']
break
if deviceUDID != None:
deviceRuntime = runtime
# Stop searching in this runtime
break
# Launch the process using simctl