diff options
| author | Frederic Riss <friss@apple.com> | 2018-11-17 00:40:31 +0000 |
|---|---|---|
| committer | Frederic Riss <friss@apple.com> | 2018-11-17 00:40:31 +0000 |
| commit | f7c101b653ebc0752c805edb437fb57323483830 (patch) | |
| tree | 8d8fe7889c2c49fc8c765d85110c17c9c8d022a9 /lldb/packages/Python/lldbsuite/test/tools/lldb-server | |
| parent | c265e7673d68e91bede3f2bca644780aee3a5427 (diff) | |
| download | bcm5719-llvm-f7c101b653ebc0752c805edb437fb57323483830.tar.gz bcm5719-llvm-f7c101b653ebc0752c805edb437fb57323483830.zip | |
Make TestAppleSimulatorOSType.py more flexible
Different versions of Xcode have different outputs for the simctl command
llvm-svn: 347117
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/tools/lldb-server')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py index 54836b21f81..62c948c36cf 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py @@ -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: |
