diff options
| author | Johnny Chen <johnny.chen@apple.com> | 2011-10-24 23:01:06 +0000 |
|---|---|---|
| committer | Johnny Chen <johnny.chen@apple.com> | 2011-10-24 23:01:06 +0000 |
| commit | aeab25c70fb4defadb281d0d62faa5d1c1772d89 (patch) | |
| tree | bccf8be5cc4fb1740f6564fd5bcdabfe95ea781f | |
| parent | f33bfbbace7bc561203ef43f5fdcb5a8544979c2 (diff) | |
| download | bcm5719-llvm-aeab25c70fb4defadb281d0d62faa5d1c1772d89.tar.gz bcm5719-llvm-aeab25c70fb4defadb281d0d62faa5d1c1772d89.zip | |
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
| -rw-r--r-- | lldb/source/Target/Target.cpp | 8 | ||||
| -rw-r--r-- | lldb/test/functionalities/abbreviation/TestAbbreviations.py | 13 |
2 files changed, 14 insertions, 7 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; } diff --git a/lldb/test/functionalities/abbreviation/TestAbbreviations.py b/lldb/test/functionalities/abbreviation/TestAbbreviations.py index 31073af1e4e..a3dcf99b621 100644 --- a/lldb/test/functionalities/abbreviation/TestAbbreviations.py +++ b/lldb/test/functionalities/abbreviation/TestAbbreviations.py @@ -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__': |
