1 files changed, 10 insertions, 42 deletions
diff --git a/lldb/test/functionalities/process_attach/TestProcessAttach.py b/lldb/test/functionalities/process_attach/TestProcessAttach.py
index 56a94392e8d..b8005c2c02a 100644
--- a/lldb/test/functionalities/process_attach/TestProcessAttach.py
+++ b/lldb/test/functionalities/process_attach/TestProcessAttach.py
@@ -14,46 +14,9 @@ class ProcessAttachTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
-    @dsym_test
-    def test_attach_to_process_by_id_with_dsym(self):
+    def test_attach_to_process_by_id(self):
         """Test attach by process id"""
-        self.buildDsym()
-        self.process_attach_by_id()
-
-    @dwarf_test
-    def test_attach_to_process_by_id_with_dwarf(self):
-        """Test attach by process id"""
-        self.buildDwarf()
-        self.process_attach_by_id()
-
-    @skipUnlessDarwin
-    @dsym_test
-    def test_attach_to_process_by_name_with_dsym(self):
-        """Test attach by process name"""
-        self.buildDsym()
-        self.process_attach_by_name()
-
-    @dwarf_test
-    def test_attach_to_process_by_name_with_dwarf(self):
-        """Test attach by process name"""
-        self.buildDwarf()
-        self.process_attach_by_name()
-
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-
-    def tearDown(self):
-        # Destroy process before TestBase.tearDown()
-        self.dbg.GetSelectedTarget().GetProcess().Destroy()
-
-        # Call super's tearDown().
-        TestBase.tearDown(self)
-
-    def process_attach_by_id(self):
-        """Test attach by process id"""
-
+        self.build()
         exe = os.path.join(os.getcwd(), exe_name)
 
         # Spawn a new process
@@ -67,10 +30,9 @@ class ProcessAttachTestCase(TestBase):
         process = target.GetProcess()
         self.assertTrue(process, PROCESS_IS_VALID)
 
-
-    def process_attach_by_name(self):
+    def test_attach_to_process_by_name(self):
         """Test attach by process name"""
-
+        self.build()
         exe = os.path.join(os.getcwd(), exe_name)
 
         # Spawn a new process
@@ -84,6 +46,12 @@ class ProcessAttachTestCase(TestBase):
         process = target.GetProcess()
         self.assertTrue(process, PROCESS_IS_VALID)
 
+    def tearDown(self):
+        # Destroy process before TestBase.tearDown()
+        self.dbg.GetSelectedTarget().GetProcess().Destroy()
+
+        # Call super's tearDown().
+        TestBase.tearDown(self)
 
 if __name__ == '__main__':
     import atexit