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.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@142868 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Target/Target.cpp b/source/Target/Target.cpp
index a7e8756..359435d 100644
--- a/source/Target/Target.cpp
+++ b/source/Target/Target.cpp
@@ -1736,7 +1736,13 @@
}
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;
}
diff --git a/test/functionalities/abbreviation/TestAbbreviations.py b/test/functionalities/abbreviation/TestAbbreviations.py
index 31073af..a3dcf99 100644
--- a/test/functionalities/abbreviation/TestAbbreviations.py
+++ b/test/functionalities/abbreviation/TestAbbreviations.py
@@ -151,12 +151,13 @@
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__':