Merge pull request #6794 from adrian-prantl/test-update

Enable and fix macCatalyst test

Author: adrian-prantl

lldb/test/API/lang/swift/macCatalyst/Makefile

@@ -1,5 +1,5 @@
 SWIFT_SOURCES := main.swift
 
-SWIFTFLAGS_EXTRAS := -target $(ARCH)-apple-ios13.0-macabi
+SWIFTFLAGS_EXTRAS := -target $(ARCH)-apple-ios14-macabi
 
 include Makefile.rules

lldb/test/API/lang/swift/macCatalyst/TestSwiftMacCatalyst.py

@@ -10,14 +10,12 @@ class TestSwiftMacCatalyst(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    # There's a bug that prevents the maccatalyst SDK overlays from being built.
-    @expectedFailureAll(bugnumber='rdar://problem/62658576')
     @swiftTest
     @skipIf(macos_version=["<", "10.15"])
     @skipUnlessDarwin
     @skipIfDarwinEmbedded
     def test_macCatalyst(self):
-        """Test the x86_64-apple-ios-macabi target.
+        """Test the ${arch}-apple-ios-macabi target.
            Note that this test only works when build-script
            is being invoked with --maccatalyst!
         """
@@ -29,22 +27,22 @@ def test_macCatalyst(self):
         lldbutil.run_to_source_breakpoint(self, "break here",
                                           lldb.SBFileSpec('main.swift'))
         self.expect("image list -t -b",
-                    patterns=["x86_64-apple-ios13.0.0-macabi a\.out",
-                              "x86_64.*-apple-ios.*-macabi Foundation",
-                              "x86_64.*-apple-.* libswiftCore",
-                              "x86_64.*-apple-macosx.* libcompiler_rt.dylib"])
-        self.expect("fr v s", "Hello macCatalyst")
+                    patterns=["-apple-ios14.0.0-macabi a\.out",
+                              "-apple-ios.*-macabi Foundation",
+                              "-apple-.* libswiftCore",
+                              "-apple-macosx.* libcompiler_rt.dylib"])
+        self.expect("fr v s", substrs=["Hello macCatalyst"])
         expr_log = self.getBuildArtifact("expr.log")
         self.expect('log enable lldb expr -f "%s"' % expr_log)
-        self.expect("expression s", "Hello macCatalyst")
+        self.expect("expression s", substrs=["Hello macCatalyst"])
         import io
         expr_logfile = io.open(expr_log, "r", encoding='utf-8')
 
         import re
         availability_re = re.compile(r'@available\(macCatalyst 1.*, \*\)')
         found = False
         for line in expr_logfile:
-            print(line)
+            self.trace(line)
             if availability_re.search(line):
                found = True
                break
@@ -58,9 +56,10 @@ def test_macCatalyst(self):
             if 'Using prebuilt Swift module cache path: ' in line:
                 self.assertTrue(line.endswith('/macosx/prebuilt-modules\n'),
                                 'unexpected prebuilt cache path: ' + line)
-                found = True
-            if 'SDK path' in line:
-                self.assertTrue('SDKs/MacOSX' in line, 'picked non-macOS SDK:' + line)
+                found_prebuilt = True
+            if 'SDK path ' in line:
+                self.assertTrue('SDKs/MacOSX' in line,
+                                'picked non-macOS SDK:' + line)
                 found_sdk = True
         self.assertTrue(found_prebuilt, 'prebuilt cache path log entry not found')
         self.assertTrue(found_sdk, 'SDK path log entry not found')

lldb/test/API/lang/swift/macCatalyst/main.swift

@@ -1,5 +1,5 @@
 func use<T>(_ t: T) {}
 
 import Foundation
-let s = NSString(string: "Hello MacABI")
+let s = NSString(string: "Hello macCatalyst")
 use(s) // break here