1 files changed, 9 insertions, 48 deletions
diff --git a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
index fd8cf77b7e8..76fbc1559ba 100644
--- a/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
+++ b/lldb/test/functionalities/thread/create_during_step/TestCreateDuringStep.py
@@ -12,59 +12,32 @@ class CreateDuringStepTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
-    @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained
-    @dsym_test
-    def test_step_inst_with_dsym(self):
-        """Test thread creation during step-inst handling."""
-        self.buildDsym(dictionary=self.getBuildFlags())
-        self.create_during_step_inst_test()
-
-    @skipUnlessDarwin
-    @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained
-    @dsym_test
-    def test_step_over_with_dsym(self):
-        """Test thread creation during step-over handling."""
-        self.buildDsym(dictionary=self.getBuildFlags())
-        self.create_during_step_over_test()
-
-    @skipUnlessDarwin
-    @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained
-    @dsym_test
-    def test_step_in_with_dsym(self):
-        """Test thread creation during step-in handling."""
-        self.buildDsym(dictionary=self.getBuildFlags())
-        self.create_during_step_in_test()
-
     @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained
     @expectedFailureFreeBSD("llvm.org/pr18190") # thread states not properly maintained
     @expectedFailureLinux("llvm.org/pr15824") # thread states not properly maintained
     @expectedFailureWindows("llvm.org/pr24668") # Breakpoints not resolved correctly
-    @dwarf_test
-    def test_step_inst_with_dwarf(self):
+    def test_step_inst(self):
         """Test thread creation during step-inst handling."""
-        self.buildDwarf(dictionary=self.getBuildFlags())
-        self.create_during_step_inst_test()
+        self.build(dictionary=self.getBuildFlags())
+        self.create_during_step_base("thread step-inst -m all-threads", 'stop reason = instruction step')
 
     @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained
     @expectedFailureFreeBSD("llvm.org/pr18190") # thread states not properly maintained
     @expectedFailureLinux("llvm.org/pr15824") # thread states not properly maintained
     @expectedFailureWindows("llvm.org/pr24668") # Breakpoints not resolved correctly
-    @dwarf_test
-    def test_step_over_with_dwarf(self):
+    def test_step_over(self):
         """Test thread creation during step-over handling."""
-        self.buildDwarf(dictionary=self.getBuildFlags())
-        self.create_during_step_over_test()
+        self.build(dictionary=self.getBuildFlags())
+        self.create_during_step_base("thread step-over -m all-threads", 'stop reason = step over')
 
     @expectedFailureDarwin("llvm.org/pr15824") # thread states not properly maintained
     @expectedFailureFreeBSD("llvm.org/pr18190") # thread states not properly maintained
     @expectedFailureLinux("llvm.org/pr15824") # thread states not properly maintained
     @expectedFailureWindows("llvm.org/pr24668") # Breakpoints not resolved correctly
-    @dwarf_test
-    def test_step_in_with_dwarf(self):
+    def test_step_in(self):
         """Test thread creation during step-in handling."""
-        self.buildDwarf(dictionary=self.getBuildFlags())
-        self.create_during_step_in_test()
+        self.build(dictionary=self.getBuildFlags())
+        self.create_during_step_base("thread step-in -m all-threads", 'stop reason = step in')
 
     def setUp(self):
         # Call super's setUp().
@@ -73,18 +46,6 @@ class CreateDuringStepTestCase(TestBase):
         self.breakpoint = line_number('main.cpp', '// Set breakpoint here')
         self.continuepoint = line_number('main.cpp', '// Continue from here')
 
-    def create_during_step_inst_test(self):
-        """Test thread creation while using step-inst."""
-        self.create_during_step_base("thread step-inst -m all-threads", 'stop reason = instruction step')
-
-    def create_during_step_over_test(self):
-        """Test thread creation while using step-over."""
-        self.create_during_step_base("thread step-over -m all-threads", 'stop reason = step over')
-
-    def create_during_step_in_test(self):
-        """Test thread creation while using step-in."""
-        self.create_during_step_base("thread step-in -m all-threads", 'stop reason = step in')
-
     def create_during_step_base(self, step_cmd, step_stop_reason):
         """Test thread creation while using step-in."""
         exe = os.path.join(os.getcwd(), "a.out")