1 files changed, 12 insertions, 13 deletions
diff --git a/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py b/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
index 0cbd94e199dc..4b1247316e18 100644
--- a/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
+++ b/packages/Python/lldbsuite/test/functionalities/thread/state/TestThreadStates.py
@@ -52,17 +52,6 @@ class ThreadStateTestCase(TestBase):
         self.thread_state_after_expression_test()
 
     # thread states not properly maintained
-    @unittest2.expectedFailure("llvm.org/pr16712")
-    @expectedFailureAll(
-        oslist=["windows"],
-        bugnumber="llvm.org/pr24668: Breakpoints not resolved correctly")
-    @skipIfDarwin # llvm.org/pr15824 thread states not properly maintained and <rdar://problem/28557237>
-    def test_process_interrupt(self):
-        """Test process interrupt."""
-        self.build(dictionary=self.getBuildFlags(use_cpp11=False))
-        self.process_interrupt_test()
-
-    # thread states not properly maintained
     @unittest2.expectedFailure("llvm.org/pr15824 and <rdar://problem/28557237>")
     @expectedFailureAll(
         oslist=["windows"],
@@ -198,13 +187,19 @@ class ThreadStateTestCase(TestBase):
         # Let the process run to completion
         self.runCmd("process continue")
 
-    def process_interrupt_test(self):
+    @expectedFailureAll(
+        oslist=["windows"],
+        bugnumber="llvm.org/pr24668: Breakpoints not resolved correctly")
+    @skipIfDarwin # llvm.org/pr15824 thread states not properly maintained and <rdar://problem/28557237>
+    @no_debug_info_test
+    def test_process_interrupt(self):
         """Test process interrupt and continue."""
+        self.build(dictionary=self.getBuildFlags(use_cpp11=False))
         exe = self.getBuildArtifact("a.out")
         self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
 
         # This should create a breakpoint in the main thread.
-        lldbutil.run_break_set_by_file_and_line(
+        bpno = lldbutil.run_break_set_by_file_and_line(
             self, "main.cpp", self.break_1, num_expected_locations=1)
 
         # Run the program.
@@ -218,6 +213,10 @@ class ThreadStateTestCase(TestBase):
             process, lldb.eStopReasonBreakpoint)
         self.assertIsNotNone(thread)
 
+        # Remove the breakpoint to avoid the single-step-over-bkpt dance in the
+        # "continue" below
+        self.assertTrue(target.BreakpointDelete(bpno))
+
         # Continue, the inferior will go into an infinite loop waiting for
         # 'g_test' to change.
         self.dbg.SetAsync(True)