1 files changed, 4 insertions, 22 deletions
diff --git a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py b/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
index 06821fc8157..e1bd0ddc074 100644
--- a/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
+++ b/lldb/test/functionalities/watchpoint/multiple_threads/TestWatchpointMultipleThreads.py
@@ -13,37 +13,19 @@ class WatchpointForMultipleThreadsTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
-    @dsym_test
-    def test_watchpoint_multiple_threads_with_dsym(self):
-        """Test that lldb watchpoint works for multiple threads."""
-        self.buildDsym()
-        self.setTearDownCleanup()
-        self.hello_multiple_threads()
-
-    @dwarf_test
     @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
     @expectedFailureWindows("llvm.org/pr24446") # WINDOWS XFAIL TRIAGE - Watchpoints not supported on Windows
-    def test_watchpoint_multiple_threads_with_dwarf(self):
+    def test_watchpoint_multiple_threads(self):
         """Test that lldb watchpoint works for multiple threads."""
-        self.buildDwarf()
+        self.build()
         self.setTearDownCleanup()
         self.hello_multiple_threads()
 
-    @skipUnlessDarwin
-    @dsym_test
-    def test_watchpoint_multiple_threads_wp_set_and_then_delete_with_dsym(self):
-        """Test that lldb watchpoint works for multiple threads, and after the watchpoint is deleted, the watchpoint event should no longer fires."""
-        self.buildDsym()
-        self.setTearDownCleanup()
-        self.hello_multiple_threads_wp_set_and_then_delete()
-
-    @dwarf_test
     @expectedFailureAndroid(archs=['arm', 'aarch64']) # Watchpoints not supported
     @expectedFailureWindows("llvm.org/pr24446") # WINDOWS XFAIL TRIAGE - Watchpoints not supported on Windows
-    def test_watchpoint_multiple_threads_wp_set_and_then_delete_with_dwarf(self):
+    def test_watchpoint_multiple_threads_wp_set_and_then_delete(self):
         """Test that lldb watchpoint works for multiple threads, and after the watchpoint is deleted, the watchpoint event should no longer fires."""
-        self.buildDwarf()
+        self.build()
         self.setTearDownCleanup()
         self.hello_multiple_threads_wp_set_and_then_delete()