1 files changed, 6 insertions, 3 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
index db01c00bbcd..f3910f12bab 100644
--- a/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
+++ b/lldb/packages/Python/lldbsuite/test/functionalities/process_attach/TestProcessAttach.py
@@ -46,15 +46,18 @@ class ProcessAttachTestCase(TestBase):
         except OSError, e:
             if e.errno != os.errno.EEXIST:
                 raise
-        self.buildProgram('main.cpp',os.path.join(os.getcwd(),'newdir','proc_attach'))
-        exe = os.path.join('.','newdir','proc_attach')
-        self.addTearDownHook(lambda: shutil.rmtree(os.path.join(os.getcwd())))
+        testdir = os.getcwd()
+        newdir = os.path.join(testdir,'newdir')
+        exe = os.path.join(newdir, 'proc_attach')
+        self.buildProgram('main.cpp', exe)
+        self.addTearDownHook(lambda: shutil.rmtree(newdir))
 
         # Spawn a new process
         popen = self.spawnSubprocess(exe)
         self.addTearDownHook(self.cleanupSubprocesses)
 
         os.chdir('newdir')
+        self.addTearDownHook(lambda: os.chdir(testdir))
         self.runCmd("process attach -p " + str(popen.pid))
 
         target = self.dbg.GetSelectedTarget()