[lldb/test] Refine TestSwiftProgressReporting (NFC)

This patch simplifies the inferior for TestSwiftProgressReporting, by
creating a variable using a type defined in an imported module.

It also improve the test by making sure it receives each kind of
expected swift progress events.

Signed-off-by: Med Ismail Bennani <[email protected]>

Author: medismailben

lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/Invisible.swift

@@ -0,0 +1 @@
+public struct 👻 { public init() { print("boooooo!") } }

lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/Makefile

@@ -1,3 +1,14 @@
 SWIFT_SOURCES := main.swift
 
+LD_EXTRAS := -L. -linvisible
+SWIFTFLAGS_EXTRAS := -I.
+
+all: libinvisible.dylib $(EXE)
+
 include Makefile.rules
+
+libinvisible.dylib: Invisible.swift
+	$(MAKE) -f $(MAKEFILE_RULES) \
+		MAKE_DSYM=YES DYLIB_ONLY=YES DYLIB_NAME=Invisible \
+		DYLIB_SWIFT_SOURCES="Invisible.swift" \
+		SWIFTFLAGS_EXTRAS=-I$(BUILDDIR)

lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/TestSwiftProgressReporting.py

@@ -16,6 +16,7 @@ class TestSwiftProgressReporting(EventListenerTestBase):
     event_data_extractor = lldb.SBDebugger.GetProgressFromEvent
 
     @swiftTest
+    @skipIf(oslist=no_match(["macosx"]))
     def test_swift_progress_report(self):
         """Test that we are able to fetch swift type-system progress events"""
         self.build()
@@ -28,7 +29,7 @@ def test_swift_progress_report(self):
         self.assertTrue(frame, "Invalid frame.")
 
         # Resolve variable to exercise the type-system
-        self.runCmd("expr numbers")
+        self.runCmd("expr boo")
 
         self.assertGreater(len(self.events), 0)
 

lldb/test/API/functionalities/progress_reporting/swift_progress_reporting/main.swift

@@ -1,48 +1,7 @@
-struct IntPair {
-  var original: Int
-  var opposite: Int
-
-  init(_ value: Int) {
-    self.original = value
-    self.opposite = -value
-  }
-}
-
-enum Toggle { case On; case Off }
-
-enum ColorCode {
-  case RGB(UInt8, UInt8, UInt8)
-  case Hex(Int)
-}
-
-protocol Flyable {
-  var fly : String { get }
-}
-
-struct Bird: Flyable {
-  var fly: String = "🦅"
-}
-
-struct Plane: Flyable {
-  var fly: String = "🛩"
-}
-
-class Number<T:Numeric> {
-  var number_value : T
-
-  init (number value : T) {
-    number_value = value
-  }
-}
+import Invisible
 
 func main() {
-  let structArray = [ IntPair(1), IntPair(-2), IntPair(3) ]
-  var enumArray = [ Toggle.Off ]
-  var colors = [ColorCode.RGB(155,219,255), ColorCode.Hex(0x4545ff)]
-  var flyingObjects : [Flyable] = [ Bird(), Plane() ]
-  let numbers = [ Number(number: 42), Number(number: 3.14)]
-  let bytes = [UInt8](0...255)
-  var bits : [UInt8] = [0,1]
+  let boo = Invisible.👻()
   print("break here")
 }