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

1 files changed, 7 insertions, 1 deletions

diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index a7e87563c9b..359435de46c 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -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;
                 }