1 files changed, 6 insertions, 26 deletions
diff --git a/lldb/test/functionalities/signal/raise/TestRaise.py b/lldb/test/functionalities/signal/raise/TestRaise.py
index b6672779b64..0099251cb98 100644
--- a/lldb/test/functionalities/signal/raise/TestRaise.py
+++ b/lldb/test/functionalities/signal/raise/TestRaise.py
@@ -13,24 +13,15 @@ class RaiseTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
-    @dsym_test
-    def test_sigstop_with_dsym(self):
-        self.buildDsym()
+    def test_sigstop(self):
+        self.build()
         self.signal_test('SIGSTOP', False)
         # passing of SIGSTOP is not correctly handled, so not testing that scenario: https://llvm.org/bugs/show_bug.cgi?id=23574
 
-    @dwarf_test
-    def test_sigstop_with_dwarf(self):
-        self.buildDwarf()
-        self.signal_test('SIGSTOP', False)
-        # passing of SIGSTOP is not correctly handled, so not testing that scenario: https://llvm.org/bugs/show_bug.cgi?id=23574
-
-    @dwarf_test
     @skipIfDarwin # darwin does not support real time signals
     @skipIfTargetAndroid()
-    def test_sigsigrtmin_with_dwarf(self):
-        self.buildDwarf()
+    def test_sigsigrtmin(self):
+        self.build()
         self.signal_test('SIGRTMIN', True)
 
     def launch(self, target, signal):
@@ -154,23 +145,12 @@ class RaiseTestCase(TestBase):
         # reset signal handling to default
         self.set_handle(signal, default_pass, default_stop, default_notify)
 
-    @dwarf_test
     @expectedFailureLinux("llvm.org/pr24530") # the signal the inferior generates gets lost
     @expectedFailureDarwin("llvm.org/pr24530") # the signal the inferior generates gets lost
-    def test_restart_bug_with_dwarf(self):
-        self.buildDwarf()
-        self.restart_bug_test()
-
-    @dsym_test
-    @expectedFailureDarwin("llvm.org/pr24530") # the signal the inferior generates gets lost
-    def test_restart_bug_with_dsym(self):
-        self.buildDsym()
-        self.restart_bug_test()
-
-    def restart_bug_test(self):
+    def test_restart_bug(self):
         """Test that we catch a signal in the edge case where the process receives it while we are
         about to interrupt it"""
-
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
 
         # Create a target by the debugger.