Fix test on Apple Silicon

Author: adrian-prantl

lldb/test/API/lang/swift/deployment_target/Makefile

@@ -1,12 +1,12 @@
 all: libNewerTarget.dylib a.out dlopen_module
 
 SWIFT_SOURCES=main.swift
-SWIFTFLAGS_EXTRAS=-target x86_64-apple-macosx10.10 -Xfrontend -disable-target-os-checking -I$(BUILDDIR)
+SWIFTFLAGS_EXTRAS=-target $(ARCH)-apple-macosx11.0 -Xfrontend -disable-target-os-checking -I$(BUILDDIR)
 LD_EXTRAS=-lNewerTarget -L$(BUILDDIR)
 
 include Makefile.rules
 
-# This test only works on macOS 10.11+.
+# This test only works on macOS 11.1+.
 
 a.out: main.swift libNewerTarget.dylib
 
@@ -23,7 +23,7 @@ lib%.dylib: %.swift
 		DYLIB_ONLY=YES \
 		DYLIB_NAME=$(patsubst lib%.dylib,%,$@) \
 		DYLIB_SWIFT_SOURCES=$(patsubst lib%.dylib,%.swift,$@) \
-		SWIFTFLAGS_EXTRAS="-target x86_64-apple-macosx10.11"
+		SWIFTFLAGS_EXTRAS="-target $(ARCH)-apple-macosx11.1"
 
 clean::
 	rm -rf *.swiftmodule *.swiftdoc *.dSYM *~ lib*.dylib a.out dlopen_module *.o

lldb/test/API/lang/swift/deployment_target/TestSwiftDeploymentTarget.py

@@ -29,7 +29,7 @@ class TestSwiftDeploymentTarget(TestBase):
             setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
     @skipIfDarwinEmbedded # This test uses macOS triples explicitly.
-    @skipIf(macos_version=["<", "10.11"])
+    @skipIf(macos_version=["<", "11.1"])
     @swiftTest
     def test_swift_deployment_target(self):
         self.build()
@@ -42,7 +42,7 @@ def test_swift_deployment_target(self):
             setting=('symbols.use-swift-clangimporter', 'false'))
     @skipUnlessDarwin
     @skipIfDarwinEmbedded # This test uses macOS triples explicitly.
-    @skipIf(macos_version=["<", "10.11"])
+    @skipIf(macos_version=["<", "11.1"])
     @swiftTest
     def test_swift_deployment_target_dlopen(self):
         self.build()
@@ -55,7 +55,7 @@ def test_swift_deployment_target_dlopen(self):
 
     @skipUnlessDarwin
     @skipIfDarwinEmbedded # This test uses macOS triples explicitly.
-    @skipIf(macos_version=["<", "10.11"])
+    @skipIf(macos_version=["<", "11.1"])
     @swiftTest
     def test_swift_deployment_target_from_macho(self):
         self.build(dictionary={"MAKE_DSYM": "NO"})
@@ -70,10 +70,11 @@ def test_swift_deployment_target_from_macho(self):
         found_no_ast = False
         found_triple = False
         logfile = open(log, "r")
+        print (log)
         for line in logfile:
             if 'SwiftASTContextForModule("a.out")::DeserializeAllCompilerFlags() -- Found 0 AST file data entries.' in line:
                 found_no_ast = True
-            if 'SwiftASTContextForModule("a.out")::SetTriple("x86_64-apple-macosx10.10.0")' in line:
+            if 'SwiftASTContextForModule("a.out")::SetTriple(' in line and 'apple-macosx11.0' in line:
                 found_triple = True
         self.assertTrue(found_no_ast)
         self.assertTrue(found_triple)