Merge pull request #6042 from adrian-prantl/playground-split

Split playgrounds test into multiple test functions

Author: adrian-prantl

lldb/test/API/lang/swift/playgrounds/TestSwiftPlaygrounds.py

@@ -70,27 +70,48 @@ def get_run_triple(self):
     @swiftTest
     @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
     @skipIf(debug_info=decorators.no_match("dsym"))
-    def test_cross_module_extension(self):
+    def test_force_target(self):
+        """Test that playgrounds work"""
+        self.launch(True)
+        self.do_basic_test(True)
+
+    @skipUnlessDarwin
+    @swiftTest
+    @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
+    @skipIf(debug_info=decorators.no_match("dsym"))
+    def test_no_force_target(self):
+        """Test that playgrounds work"""
+        self.launch(False)
+        self.do_basic_test(False)
+
+    @skipUnlessDarwin
+    @swiftTest
+    @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
+    @skipIf(debug_info=decorators.no_match("dsym"))
+    def test_concurrency(self):
+        """Test that concurrency is available in playgrounds"""
+        self.launch(True)
+        self.do_concurrency_test()
+
+    @skipUnlessDarwin
+    @swiftTest
+    @skipIf(setting=('symbols.use-swift-clangimporter', 'false'))
+    @skipIf(debug_info=decorators.no_match("dsym"))
+    def test_import(self):
+        """Test that a dylib can be imported in playgrounds"""
+        self.launch(True)
+        self.do_concurrency_test()
+
+        
+    def launch(self, force_target):
         """Test that playgrounds work"""
         self.build(dictionary={
             'TARGET_SWIFTFLAGS':
             '-target {}'.format(self.get_build_triple()),
         })
-        self.do_test(True)
-        self.do_test(False)
-
-    def setUp(self):
-        TestBase.setUp(self)
-        self.PlaygroundStub_source = "PlaygroundStub.swift"
-        self.PlaygroundStub_source_spec = lldb.SBFileSpec(
-            self.PlaygroundStub_source)
-
-    def do_test(self, force_target):
-        """Test that playgrounds work"""
-        exe_name = "PlaygroundStub"
-        exe = self.getBuildArtifact(exe_name)
 
         # Create the target
+        exe = self.getBuildArtifact("PlaygroundStub")
         if force_target:
             target = self.dbg.CreateTargetWithFileAndArch(
                 exe, self.get_run_triple())
@@ -103,7 +124,7 @@ def do_test(self, force_target):
 
         # Set the breakpoints
         breakpoint = target.BreakpointCreateBySourceRegex(
-            'Set breakpoint here', self.PlaygroundStub_source_spec)
+            'Set breakpoint here', lldb.SBFileSpec("PlaygroundStub.swift"))
         self.assertTrue(breakpoint.GetNumLocations() > 0, VALID_BREAKPOINT)
 
         process = target.LaunchSimple(None, None, os.getcwd())
@@ -116,19 +137,21 @@ def do_test(self, force_target):
         self.expect('settings set target.swift-framework-search-paths "%s"' %
                     self.getBuildDir())
 
+        self.options = lldb.SBExpressionOptions()
+        self.options.SetLanguage(lldb.eLanguageTypeSwift)
+        self.options.SetPlaygroundTransformEnabled()
+        # The concurrency expressions will spawn multiple threads.
+        self.options.SetOneThreadTimeoutInMicroSeconds(1)
+        self.options.SetTryAllThreads(True)
+
+
+    def do_basic_test(self, force_target):
         contents = ""
 
         with open('Contents.swift', 'r') as contents_file:
             contents = contents_file.read()
 
-        options = lldb.SBExpressionOptions()
-        options.SetLanguage(lldb.eLanguageTypeSwift)
-        options.SetPlaygroundTransformEnabled()
-        # The concurrency expressions will spawn multiple threads.
-        options.SetOneThreadTimeoutInMicroSeconds(1)
-        options.SetTryAllThreads(True)
-
-        self.frame().EvaluateExpression(contents, options)
+        self.frame().EvaluateExpression(contents, self.options)
         ret = self.frame().EvaluateExpression("get_output()")
         playground_output = ret.GetSummary()
         if not force_target:
@@ -144,21 +167,22 @@ def do_test(self, force_target):
         self.assertTrue("=\\'8\\'" in playground_output)
         self.assertTrue("=\\'11\\'" in playground_output)
 
-        # Test concurrency
+    def do_concurrency_test(self):
         contents = "error"
         with open('Concurrency.swift', 'r') as contents_file:
             contents = contents_file.read()
-        res = self.frame().EvaluateExpression(contents, options)
+        res = self.frame().EvaluateExpression(contents, self.options)
         ret = self.frame().EvaluateExpression("get_output()")
         playground_output = ret.GetSummary()
         self.assertTrue(playground_output is not None)
         self.assertIn("=\\'23\\'", playground_output)
 
+    def do_import_test(self):
         # Test importing a library that adds new Clang options.
         log = self.getBuildArtifact('types.log')
         self.expect('log enable lldb types -f ' + log)
         contents = "import Dylib\nf()\n"
-        res = self.frame().EvaluateExpression(contents, options)
+        res = self.frame().EvaluateExpression(contents, self.options)
         ret = self.frame().EvaluateExpression("get_output()")
         playground_output = ret.GetSummary()
         self.assertTrue(playground_output is not None)