From f73363f1dd94996356cefbf24388f561891acf0b Mon Sep 17 00:00:00 2001 From: Dimitry Andric Date: Sat, 28 Jul 2018 11:09:23 +0000 Subject: Vendor import of lldb trunk r338150: https://llvm.org/svn/llvm-project/lldb/trunk@338150 --- packages/Python/lldbsuite/test/concurrent_base.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'packages/Python/lldbsuite/test/concurrent_base.py') diff --git a/packages/Python/lldbsuite/test/concurrent_base.py b/packages/Python/lldbsuite/test/concurrent_base.py index 4a7ae0b9c279..574b305afcbe 100644 --- a/packages/Python/lldbsuite/test/concurrent_base.py +++ b/packages/Python/lldbsuite/test/concurrent_base.py @@ -32,13 +32,12 @@ class ConcurrentEventsBase(TestBase): super(ConcurrentEventsBase, self).setUp() # Find the line number for our breakpoint. self.filename = 'main.cpp' - source_relpath = os.path.join(os.path.pardir, self.filename) self.thread_breakpoint_line = line_number( - source_relpath, '// Set breakpoint here') + self.filename, '// Set breakpoint here') self.setup_breakpoint_line = line_number( - source_relpath, '// Break here and adjust num') + self.filename, '// Break here and adjust num') self.finish_breakpoint_line = line_number( - source_relpath, '// Break here and verify one thread is active') + self.filename, '// Break here and verify one thread is active') def describe_threads(self): ret = [] @@ -114,7 +113,7 @@ class ConcurrentEventsBase(TestBase): watchpoint_func. The inferior is continued until exit or a crash takes place, and the number of events seen by LLDB is verified to match the expected number of events. """ - exe = os.path.join(os.getcwd(), "a.out") + exe = self.getBuildArtifact("a.out") self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET) # Get the target -- cgit v1.2.3