Skip to content

Commit 89ad7f7

Browse files
committed
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
1 parent c92e51d commit 89ad7f7

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

lldb/packages/Python/lldbsuite/test/api/log/TestAPILog.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,16 @@ def cleanup():
3636

3737
# Find the SBDebugger's address.
3838
debugger_addr = re.findall(
39-
r"lldb::SBDebugger::GetScriptingLanguage\(const char \*\) \(0x([0-9a-fA-F]+),",
39+
r"lldb::SBDebugger::GetScriptingLanguage\([^)]*\) \(0x([0-9a-fA-F]+),",
4040
log)
4141

4242
# Make sure we've found a match.
4343
self.assertTrue(debugger_addr, log)
4444

4545
# Make sure the GetScriptingLanguage matches.
46-
get_scripting_language = 'lldb::SBDebugger::GetScriptingLanguage(const char *) (0x{}, "")'.format(
47-
debugger_addr[0])
48-
self.assertTrue(get_scripting_language in log, log)
46+
self.assertTrue(re.search(r'lldb::SBDebugger::GetScriptingLanguage\([^)]*\) \(0x{}, ""\)'.format(
47+
debugger_addr[0]), log), log)
4948

5049
# Make sure the address matches.
51-
create_target = 'lldb::SBDebugger::CreateTarget(const char *) (0x{}, "")'.format(
52-
debugger_addr[0])
53-
self.assertTrue(create_target in log, log)
50+
self.assertTrue(re.search(r'lldb::SBDebugger::CreateTarget\([^)]*\) \(0x{}, ""\)'.format(
51+
debugger_addr[0]), log), log)

0 commit comments

Comments
 (0)