[Lldb-commits] [lldb] r355644 - Fix TestAppleSimulatorOSType.py with Xcode 10.2

Frederic Riss via lldb-commits lldb-commits at lists.llvm.org
Thu Mar 7 14:12:03 PST 2019


Author: friss
Date: Thu Mar  7 14:12:03 2019
New Revision: 355644

URL: http://llvm.org/viewvc/llvm-project?rev=355644&view=rev
Log:
Fix TestAppleSimulatorOSType.py with Xcode 10.2

It looks like the simctl tool shipped in Xcode10.2 changed the format of
its json output.

Modified:
    lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py

Modified: lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py Thu Mar  7 14:12:03 2019
@@ -29,7 +29,9 @@ class TestAppleSimulatorOSType(gdbremote
             if not platform in runtime.lower():
                 continue
             for device in devices:
-                if device['availability'] != '(available)':
+                if 'availability' in device and device['availability'] != '(available)':
+                    continue
+                if 'isAvailable' in device and device['isAvailable'] != True:
                     continue
                 deviceUDID = device['udid']
                 break




More information about the lldb-commits mailing list