diff options
author | Pavel Labath <pavel@labath.sk> | 2019-09-18 13:41:50 +0000 |
---|---|---|
committer | Pavel Labath <pavel@labath.sk> | 2019-09-18 13:41:50 +0000 |
commit | 89ad7f7a1ba245fccf1f64f95a146ada6f6aaac6 (patch) | |
tree | 110bcf37fa31954653b2956c1a65d57bcd1753d5 /lldb/packages/Python/lldbsuite/test | |
parent | c92e51d84bb78e4b32c229441af239f154daf75a (diff) | |
download | bcm5719-llvm-89ad7f7a1ba245fccf1f64f95a146ada6f6aaac6.tar.gz bcm5719-llvm-89ad7f7a1ba245fccf1f64f95a146ada6f6aaac6.zip |
Fir TestAPILog for gcc
different compilers will put different things into __PRETTY_FUNCTION__.
For instance gcc will not put a " " in the "const char *" argument,
causing our regex matching to fail.
This patch relaxes the regexes in this test to account for this
difference.
llvm-svn: 372224
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/api/log/TestAPILog.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/api/log/TestAPILog.py b/lldb/packages/Python/lldbsuite/test/api/log/TestAPILog.py index f6fccad8d2c..c0ffa2c6f50 100644 --- a/lldb/packages/Python/lldbsuite/test/api/log/TestAPILog.py +++ b/lldb/packages/Python/lldbsuite/test/api/log/TestAPILog.py @@ -36,18 +36,16 @@ class APILogTestCase(TestBase): # Find the SBDebugger's address. debugger_addr = re.findall( - r"lldb::SBDebugger::GetScriptingLanguage\(const char \*\) \(0x([0-9a-fA-F]+),", + r"lldb::SBDebugger::GetScriptingLanguage\([^)]*\) \(0x([0-9a-fA-F]+),", log) # Make sure we've found a match. self.assertTrue(debugger_addr, log) # Make sure the GetScriptingLanguage matches. - get_scripting_language = 'lldb::SBDebugger::GetScriptingLanguage(const char *) (0x{}, "")'.format( - debugger_addr[0]) - self.assertTrue(get_scripting_language in log, log) + self.assertTrue(re.search(r'lldb::SBDebugger::GetScriptingLanguage\([^)]*\) \(0x{}, ""\)'.format( + debugger_addr[0]), log), log) # Make sure the address matches. - create_target = 'lldb::SBDebugger::CreateTarget(const char *) (0x{}, "")'.format( - debugger_addr[0]) - self.assertTrue(create_target in log, log) + self.assertTrue(re.search(r'lldb::SBDebugger::CreateTarget\([^)]*\) \(0x{}, ""\)'.format( + debugger_addr[0]), log), log) |