From de872a697a9e41b0ee6ddece18dc33ff0d3f721c Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Tue, 27 Feb 2018 02:01:30 +0000 Subject: Move "concurrent events" tests back into one folder These tests all test very similar things, and use the same inferior. They were only placed in separate folders to achieve better paralelization. Now that we paralelize at a file level, this is no longer relevant, and we can put them together again. llvm-svn: 326159 --- lldb/packages/Python/lldbsuite/test/concurrent_base.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/concurrent_base.py') diff --git a/lldb/packages/Python/lldbsuite/test/concurrent_base.py b/lldb/packages/Python/lldbsuite/test/concurrent_base.py index e9ccd094796..574b305afcb 100644 --- a/lldb/packages/Python/lldbsuite/test/concurrent_base.py +++ b/lldb/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 = [] -- cgit v1.2.3