diff options
| author | Pavel Labath <labath@google.com> | 2018-01-09 13:22:22 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2018-01-09 13:22:22 +0000 |
| commit | 03ed2249a62d2db70d4a2e4a953d1952351d1699 (patch) | |
| tree | bdc0797bf5321ca44c15a43ce2cb2c24e584b42c /lldb/packages/Python/lldbsuite | |
| parent | a503855906b3e8ecc42393f6ce9db5aed5a0fdf8 (diff) | |
| download | bcm5719-llvm-03ed2249a62d2db70d4a2e4a953d1952351d1699.tar.gz bcm5719-llvm-03ed2249a62d2db70d4a2e4a953d1952351d1699.zip | |
TestConflictingSymbols: simplify test by using run_break_set_by_source_regexp
follow-up to r321271 based on post-commit feedback by Jim Ingham.
llvm-svn: 322075
Diffstat (limited to 'lldb/packages/Python/lldbsuite')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py index 328c383b38f..baa3c915ade 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/conflicting-symbol/TestConflictingSymbol.py @@ -16,13 +16,6 @@ class TestConflictingSymbols(TestBase): mydir = TestBase.compute_mydir(__file__) NO_DEBUG_INFO_TESTCASE = True - def setUp(self): - TestBase.setUp(self) - - self.One_line = line_number('One/One.c', '// break here') - self.Two_line = line_number('Two/Two.c', '// break here') - self.main_line = line_number('main.c', '// break here') - def test_conflicting_symbols(self): self.build() exe = os.path.join(os.getcwd(), "a.out") @@ -34,12 +27,12 @@ class TestConflictingSymbols(TestBase): environment = self.registerSharedLibrariesWithTarget( target, ['One', 'Two']) - lldbutil.run_break_set_command( - self, 'breakpoint set -f One.c -l %s' % (self.One_line)) - lldbutil.run_break_set_command( - self, 'breakpoint set -f Two.c -l %s' % (self.Two_line)) - lldbutil.run_break_set_by_file_and_line( - self, 'main.c', self.main_line, num_expected_locations=1, loc_exact=True) + lldbutil.run_break_set_by_source_regexp(self, '// break here', + extra_options='-f One.c') + lldbutil.run_break_set_by_source_regexp(self, '// break here', + extra_options='-f Two.c') + lldbutil.run_break_set_by_source_regexp(self, '// break here', + extra_options='-f main.c', num_expected_locations=1) process = target.LaunchSimple( None, environment, self.get_process_working_directory()) @@ -105,7 +98,8 @@ class TestConflictingSymbols(TestBase): environment = self.registerSharedLibrariesWithTarget( target, ['One', 'Two']) - lldbutil.run_break_set_by_file_and_line(self, 'main.c', self.main_line) + lldbutil.run_break_set_by_source_regexp(self, '// break here', + extra_options='-f main.c', num_expected_locations=1) process = target.LaunchSimple( None, environment, self.get_process_working_directory()) |
