Add more context information to the stop-hook mechanism by displaying the stop-hook

command in the '- Hook id' header.  This should improve readbility of the 'display'
command if, for example, we have issued 'display a' and 'display b' which turn into
"target stop-hook add -o 'expr -- a'" and "target stop-hook add -o 'expr -- b'".

Plus some minor change in TestAbbreviations.py to conditionalize the platform-specific
checkings of the "image list" output.

llvm-svn: 142868
This commit is contained in:
Johnny Chen
2011-10-24 23:01:06 +00:00
parent f33bfbbace
commit aeab25c70f
2 changed files with 14 additions and 7 deletions

View File

@@ -1736,7 +1736,13 @@ Target::RunStopHooks ()
}
if (print_hook_header && !any_thread_matched)
{
result.AppendMessageWithFormat("\n- Hook %llu\n", cur_hook_sp->GetID());
const char *cmd = (cur_hook_sp->GetCommands().GetSize() == 1 ?
cur_hook_sp->GetCommands().GetStringAtIndex(0) :
NULL);
if (cmd)
result.AppendMessageWithFormat("\n- Hook %llu (%s)\n", cur_hook_sp->GetID(), cmd);
else
result.AppendMessageWithFormat("\n- Hook %llu\n", cur_hook_sp->GetID());
any_thread_matched = true;
}

View File

@@ -151,12 +151,13 @@ class AbbreviationsTestCase(TestBase):
self.expect("i d symt",
patterns = ["Dumping symbol table for [0-9]+ modules."])
self.expect("i li",
substrs = [ 'a.out',
'/usr/lib/dyld',
'/usr/lib/libstdc++',
'/usr/lib/libSystem.B.dylib',
'/usr/lib/system/libmathCommon.A.dylib'])
if sys.platform.startswith("darwin"):
self.expect("i li",
substrs = [ 'a.out',
'/usr/lib/dyld',
'/usr/lib/libstdc++',
'/usr/lib/libSystem.B.dylib',
'/usr/lib/system/libmathCommon.A.dylib'])
if __name__ == '__main__':