1 files changed, 13 insertions, 67 deletions
diff --git a/lldb/test/python_api/thread/TestThreadAPI.py b/lldb/test/python_api/thread/TestThreadAPI.py
index d5b146d07ab..8ace950a46e 100644
--- a/lldb/test/python_api/thread/TestThreadAPI.py
+++ b/lldb/test/python_api/thread/TestThreadAPI.py
@@ -12,98 +12,44 @@ class ThreadAPITestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
     @python_api_test
-    @dsym_test
-    def test_get_process_with_dsym(self):
+    def test_get_process(self):
         """Test Python SBThread.GetProcess() API."""
-        self.buildDsym()
+        self.build()
         self.get_process()
 
     @python_api_test
-    @dwarf_test
-    def test_get_process_with_dwarf(self):
-        """Test Python SBThread.GetProcess() API."""
-        self.buildDwarf()
-        self.get_process()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_get_stop_description_with_dsym(self):
+    def test_get_stop_description(self):
         """Test Python SBThread.GetStopDescription() API."""
-        self.buildDsym()
+        self.build()
         self.get_stop_description()
 
     @python_api_test
-    @dwarf_test
-    def test_get_stop_description_with_dwarf(self):
-        """Test Python SBThread.GetStopDescription() API."""
-        self.buildDwarf()
-        self.get_stop_description()
-
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_run_to_address_with_dsym(self):
-        """Test Python SBThread.RunToAddress() API."""
-        # We build a different executable than the default buildDwarf() does.
-        d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDsym(dictionary=d)
-        self.setTearDownCleanup(dictionary=d)
-        self.run_to_address(self.exe_name)
-
-    @python_api_test
-    @dwarf_test
-    def test_run_to_address_with_dwarf(self):
+    def test_run_to_address(self):
         """Test Python SBThread.RunToAddress() API."""
-        # We build a different executable than the default buildDwarf() does.
+        # We build a different executable than the default build() does.
         d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDwarf(dictionary=d)
+        self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
         self.run_to_address(self.exe_name)
 
-    @skipUnlessDarwin
     @python_api_test
-    @dsym_test
-    def test_step_out_of_malloc_into_function_b_with_dsym(self):
-        """Test Python SBThread.StepOut() API to step out of a malloc call where the call site is at function b()."""
-        # We build a different executable than the default buildDsym() does.
-        d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDsym(dictionary=d)
-        self.setTearDownCleanup(dictionary=d)
-        self.step_out_of_malloc_into_function_b(self.exe_name)
-
     @expectedFailureFreeBSD # llvm.org/pr20476
-    @python_api_test
     @expectedFailureWindows # Test crashes
-    @dwarf_test
-    def test_step_out_of_malloc_into_function_b_with_dwarf(self):
+    def test_step_out_of_malloc_into_function_b(self):
         """Test Python SBThread.StepOut() API to step out of a malloc call where the call site is at function b()."""
-        # We build a different executable than the default buildDwarf() does.
+        # We build a different executable than the default build() does.
         d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDwarf(dictionary=d)
+        self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
         self.step_out_of_malloc_into_function_b(self.exe_name)
 
-    @skipUnlessDarwin
-    @python_api_test
-    @dsym_test
-    def test_step_over_3_times_with_dsym(self):
-        """Test Python SBThread.StepOver() API."""
-        # We build a different executable than the default buildDsym() does.
-        d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDsym(dictionary=d)
-        self.setTearDownCleanup(dictionary=d)
-        self.step_over_3_times(self.exe_name)
-
     @python_api_test
-    @dwarf_test
-    def test_step_over_3_times_with_dwarf(self):
+    def test_step_over_3_times(self):
         """Test Python SBThread.StepOver() API."""
-        # We build a different executable than the default buildDwarf() does.
+        # We build a different executable than the default build() does.
         d = {'CXX_SOURCES': 'main2.cpp', 'EXE': self.exe_name}
-        self.buildDwarf(dictionary=d)
+        self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
         self.step_over_3_times(self.exe_name)