From 38edd23b8cbfc46f35bb9071e86bb66c876d371c Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Fri, 26 Mar 2021 20:27:14 -0700 Subject: [PATCH] [lldb] Fix TestAppleSimulatorOSType for older watchOS SDKs Older watchOS SDKs *only* support i386 so we can't use x86_64/arm64 unconditionally. --- lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py index c0ec379..f44955a 100644 --- a/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py +++ b/lldb/test/API/tools/lldb-server/TestAppleSimulatorOSType.py @@ -47,9 +47,17 @@ class TestAppleSimulatorOSType(gdbremote_testcase.GdbRemoteTestCaseBase): # Launch the process using simctl self.assertIsNotNone(deviceUDID) + exe_name = 'test_simulator_platform_{}'.format(platform_name) sdkroot = lldbutil.get_xcode_sdk_root(sdk) vers = lldbutil.get_xcode_sdk_version(sdk) + + # Older versions of watchOS (<7.0) only support i386 + if platform_name == 'watchos': + from distutils.version import LooseVersion + if LooseVersion(vers) < LooseVersion("7.0"): + arch = 'i386' + triple = '-'.join([arch, 'apple', platform_name + vers, 'simulator']) version_min = '-m{}-simulator-version-min={}'.format(platform_name, vers) self.build( -- 2.7.4