1 files changed, 17 insertions, 30 deletions
diff --git a/lldb/test/functionalities/signal/TestSendSignal.py b/lldb/test/functionalities/signal/TestSendSignal.py
index 4b01b57413a..5ce843d5286 100644
--- a/lldb/test/functionalities/signal/TestSendSignal.py
+++ b/lldb/test/functionalities/signal/TestSendSignal.py
@@ -11,43 +11,17 @@ class SendSignalTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
-    @dsym_test
-    def test_with_dsym_and_run_command(self):
-        """Test that lldb command 'process signal SIGUSR1' sends a signal to the inferior process."""
-        self.buildDsym()
-        self.send_signal()
-
-    @expectedFailureFreeBSD("llvm.org/pr23318: does not report running state")
-    @skipIfWindows # Windows does not support signals
-    @dwarf_test
-    def test_with_dwarf_and_run_command(self):
-        """Test that lldb command 'process signal SIGUSR1' sends a signal to the inferior process."""
-        self.buildDwarf()
-        self.send_signal()
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
         # Find the line number to break inside main().
         self.line = line_number('main.c', 'Put breakpoint here')
 
-    def match_state(self, process_listener, expected_state):
-        num_seconds = 5
-        broadcaster = self.process().GetBroadcaster()
-        event_type_mask = lldb.SBProcess.eBroadcastBitStateChanged
-        event = lldb.SBEvent()
-        got_event = process_listener.WaitForEventForBroadcasterWithType(
-            num_seconds, broadcaster, event_type_mask, event)
-        self.assertTrue(got_event, "Got an event")
-        state = lldb.SBProcess.GetStateFromEvent(event)
-        self.assertTrue(state == expected_state,
-                        "It was the %s state." %
-                        lldb.SBDebugger_StateAsCString(expected_state))
-
-    def send_signal(self):
+    @expectedFailureFreeBSD("llvm.org/pr23318: does not report running state")
+    @skipIfWindows # Windows does not support signals
+    def test_with_run_command(self):
         """Test that lldb command 'process signal SIGUSR1' sends a signal to the inferior process."""
-
+        self.build()
         exe = os.path.join(os.getcwd(), "a.out")
 
         # Create a target by the debugger.
@@ -114,6 +88,19 @@ class SendSignalTestCase(TestBase):
         self.assertTrue(thread.GetStopReasonDataAtIndex(0) == lldbutil.get_signal_number('SIGUSR1'),
                 "The stop signal was SIGUSR1")
 
+    def match_state(self, process_listener, expected_state):
+        num_seconds = 5
+        broadcaster = self.process().GetBroadcaster()
+        event_type_mask = lldb.SBProcess.eBroadcastBitStateChanged
+        event = lldb.SBEvent()
+        got_event = process_listener.WaitForEventForBroadcasterWithType(
+            num_seconds, broadcaster, event_type_mask, event)
+        self.assertTrue(got_event, "Got an event")
+        state = lldb.SBProcess.GetStateFromEvent(event)
+        self.assertTrue(state == expected_state,
+                        "It was the %s state." %
+                        lldb.SBDebugger_StateAsCString(expected_state))
+
 if __name__ == '__main__':
     import atexit
     lldb.SBDebugger.Initialize()