1 files changed, 14 insertions, 29 deletions
diff --git a/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py b/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
index 73ae892dc75..8299bd28429 100644
--- a/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
+++ b/lldb/test/macosx/safe-to-func-call/TestSafeFuncCalls.py
@@ -10,41 +10,17 @@ class TestSafeFuncCalls(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_with_dsym_and_python_api(self):
-        """Test function call thread safety."""
-        self.buildDsym()
-        self.function_call_safety_check()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dwarf_test
-    def test_with_dwarf_and_python_api(self):
-        """Test function call thread safety."""
-        self.buildDwarf()
-        self.function_call_safety_check()
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line numbers that we will step to in main:
         self.main_source = "main.c"
 
-
-
-    def check_number_of_threads(self, process):
-        self.assertTrue(process.GetNumThreads() == 2, "Check that the process has two threads when sitting at the stopper() breakpoint")
-
-    def safe_to_call_func_on_main_thread (self, main_thread):
-        self.assertTrue(main_thread.SafeToCallFunctions() == True, "It is safe to call functions on the main thread")
-
-    def safe_to_call_func_on_select_thread (self, select_thread):
-        self.assertTrue(select_thread.SafeToCallFunctions() == False, "It is not safe to call functions on the select thread")
-
-    def function_call_safety_check(self):
-        """Test function call safety checks"""
+    @skipUnlessDarwin
+    @python_api_test
+    def test_with_python_api(self):
+        """Test function call thread safety."""
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
 
         target = self.dbg.CreateTarget(exe)
@@ -74,6 +50,15 @@ class TestSafeFuncCalls(TestBase):
         self.safe_to_call_func_on_main_thread (main_thread)
         self.safe_to_call_func_on_select_thread (select_thread)
 
+    def check_number_of_threads(self, process):
+        self.assertTrue(process.GetNumThreads() == 2, "Check that the process has two threads when sitting at the stopper() breakpoint")
+
+    def safe_to_call_func_on_main_thread (self, main_thread):
+        self.assertTrue(main_thread.SafeToCallFunctions() == True, "It is safe to call functions on the main thread")
+
+    def safe_to_call_func_on_select_thread (self, select_thread):
+        self.assertTrue(select_thread.SafeToCallFunctions() == False, "It is not safe to call functions on the select thread")
+
 if __name__ == '__main__':
     import atexit
     lldb.SBDebugger.Initialize()