vendor/lldb/lldb-trunk-r338150

1 files changed, 10 insertions, 4 deletions

diff --git a/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py b/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
index 0d6a6002d522..4e550c9c24db 100644
--- a/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
+++ b/packages/Python/lldbsuite/test/api/multithreaded/TestMultithreaded.py
@@ -15,6 +15,8 @@ import subprocess
 
 class SBBreakpointCallbackCase(TestBase):
 
+    NO_DEBUG_INFO_TESTCASE = True
+   
     def setUp(self):
         TestBase.setUp(self)
         self.generateSource('driver.cpp')
@@ -87,16 +89,20 @@ class SBBreakpointCallbackCase(TestBase):
 
         self.inferior = 'inferior_program'
         self.buildProgram('inferior.cpp', self.inferior)
-        self.addTearDownHook(lambda: os.remove(self.inferior))
+        self.addTearDownHook(lambda:
+                             os.remove(self.getBuildArtifact(self.inferior)))
 
         self.buildDriver(sources, test_name)
-        self.addTearDownHook(lambda: os.remove(test_name))
+        self.addTearDownHook(lambda:
+                             os.remove(self.getBuildArtifact(test_name)))
 
-        test_exe = os.path.join(os.getcwd(), test_name)
+        test_exe = self.getBuildArtifact(test_name)
         self.signBinary(test_exe)
-        exe = [test_exe, self.inferior]
+        exe = [test_exe, self.getBuildArtifact(self.inferior)]
 
         env = {self.dylibPath: self.getLLDBLibraryEnvVal()}
+        if 'LLDB_DEBUGSERVER_PATH' in os.environ:
+            env['LLDB_DEBUGSERVER_PATH'] = os.environ['LLDB_DEBUGSERVER_PATH']
         if self.TraceOn():
             print("Running test %s" % " ".join(exe))
             check_call(exe, env=env)