[lldb] Store the Apple SDK in the configuration and use it to determine the platform.

[JDevlieghere]

Summary

What the title says. This is part of upstreaming the last missing pieces to run the on-device test suite with the upstream repository.

[friss]

LGTM

[omjavaid]

This breaks LLDB arm-linux buildbot http://lab.llvm.org:8011/builders/lldb-arm-ubuntu/builds/2651

[JDevlieghere]

Fixed by e3eb3cf5501c6b97b5baa2d66193f2d610492be6

lldb/packages/Python/lldbsuite/test/configuration.py

 
 failed = False
 
 # LLDB Remote platform setting
 lldb_platform_name = None
 lldb_platform_url = None
 lldb_platform_working_dir = None
 
+# Apple SDK
+apple_sdk = None
+
 # The base directory in which the tests are being built.
 test_build_dir = None
 
 # The clang module cache directory used by lldb.
 lldb_module_cache_dir = None
 # The clang module cache directory used by clang.
 clang_module_cache_dir = None
 

lldb/packages/Python/lldbsuite/test/dotest.py

def parseOptionsAndInitTestdirs():
     configuration.rerun_all_issues = args.rerun_all_issues
 
     if args.lldb_platform_name:
         configuration.lldb_platform_name = args.lldb_platform_name
     if args.lldb_platform_url:
         configuration.lldb_platform_url = args.lldb_platform_url
     if args.lldb_platform_working_dir:
         configuration.lldb_platform_working_dir = args.lldb_platform_working_dir
+    if args.apple_sdk:
+        configuration.apple_sdk = args.apple_sdk
     if args.test_build_dir:
         configuration.test_build_dir = args.test_build_dir
     if args.lldb_module_cache_dir:
         configuration.lldb_module_cache_dir = args.lldb_module_cache_dir
     else:
         configuration.lldb_module_cache_dir = os.path.join(
             configuration.test_build_dir, 'module-cache-lldb')
     if args.clang_module_cache_dir:

lldb/packages/Python/lldbsuite/test/lldbplatformutil.py

 
 
 def getDarwinOSTriples():
     return ['darwin', 'macosx', 'ios', 'watchos', 'tvos', 'bridgeos']
 
 
 def getPlatform():
     """Returns the target platform which the tests are running on."""
-    triple = lldb.selected_platform.GetTriple()
-    if triple is None:
-      # It might be an unconnected remote platform.
-      return ''
+    # Use the Apple SDK to determine the platform if set.
+    if configuration.apple_sdk:
+        platform = configuration.apple_sdk
+        dot = platform.find('.')
+        if dot != -1:
+            platform = platform[:dot]
+        if platform == 'iphoneos':
+            platform = 'ios'
+        return platform
 
+    # Use the triple to determine the platform if set.
+    triple = lldb.selected_platform.GetTriple()
+    if triple:
         platform = triple.split('-')[2]
         if platform.startswith('freebsd'):
             platform = 'freebsd'
         elif platform.startswith('netbsd'):
             platform = 'netbsd'
         return platform
 
+    # It still might be an unconnected remote platform.
+    return ''
+
 
 def platformIsDarwin():
     """Returns true if the OS triple for the selected platform is any valid apple OS"""
     return getPlatform() in getDarwinOSTriples()
 
 
 def findMainThreadCheckerDylib():
     if not platformIsDarwin():