Author: Dave Lee Date: 2022-02-07T12:34:12-08:00 New Revision: f8d889a789e2ac7012d202971d4e214d0b13949c
URL: https://github.com/llvm/llvm-project/commit/f8d889a789e2ac7012d202971d4e214d0b13949c DIFF: https://github.com/llvm/llvm-project/commit/f8d889a789e2ac7012d202971d4e214d0b13949c.diff LOG: [lldb] Print message after loading 'crashlog' command Previously, importing `crashlog` resulted in a message being printed. The message was about other commands (those in heap.py), not `crashlog`. The changes in D117237 made it so that the heap.py messages were printed only when importing `lldb.macosx.heap`, not when importing `lldb.macosx.crashlog`. Some users may see no output and think `crashlog` wasn't successfully loaded. This ensures users see that `crashlog` is loaded. rdar://88283132 Differential Revision: https://reviews.llvm.org/D119155 Added: Modified: lldb/examples/python/crashlog.py lldb/test/Shell/Heap/heap-cstr.test lldb/test/Shell/ScriptInterpreter/Python/Crashlog/json.test lldb/test/Shell/ScriptInterpreter/Python/Crashlog/no_threadState.test lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test Removed: ################################################################################ diff --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py index 370b46a90bd99..54fc888c509c8 100755 --- a/lldb/examples/python/crashlog.py +++ b/lldb/examples/python/crashlog.py @@ -1247,3 +1247,5 @@ def __lldb_init_module(debugger, internal_dict): 'command script add -c lldb.macosx.crashlog.Symbolicate crashlog') debugger.HandleCommand( 'command script add -f lldb.macosx.crashlog.save_crashlog save_crashlog') + print('"crashlog" and "save_crashlog" commands have been installed, use ' + 'the "--help" options on these commands for detailed help.') diff --git a/lldb/test/Shell/Heap/heap-cstr.test b/lldb/test/Shell/Heap/heap-cstr.test index d2cf163578749..cabf6d6a25aab 100644 --- a/lldb/test/Shell/Heap/heap-cstr.test +++ b/lldb/test/Shell/Heap/heap-cstr.test @@ -6,6 +6,8 @@ br set -p return command script import lldb.macosx.heap run -cstr "patatino" +cstr_refs "patatino" + +# CHECK: "cstr_refs", {{.*}} commands have been installed, use the "--help" options on these commands # CHECK: {{.*}}: malloc( 16) -> {{.*}} diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/json.test b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/json.test index 068e8ef776575..ef440fb772b48 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/json.test +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/json.test @@ -8,6 +8,8 @@ # RUN: %python %S/patch-crashlog.py --binary %t.out --crashlog %t.nometadata.crash --offsets '{"main":20, "bar":9, "foo":16}' --json --no-metadata # RUN: %lldb %t.out -o 'command script import lldb.macosx.crashlog' -o 'crashlog %t.nometadata.crash' 2>&1 | FileCheck %s +# CHECK: "crashlog" {{.*}} commands have been installed, use the "--help" options on these commands + # CHECK: Thread[0] Crashing Thread Name EXC_BAD_ACCESS (SIGSEGV) (KERN_INVALID_ADDRESS at 0x0000000000000000) # CHECK: [ 0] {{.*}}out`foo + 16 at test.c # CHECK: [ 1] {{.*}}out`bar + 8 at test.c diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/no_threadState.test b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/no_threadState.test index 6d147e7274fb4..5b5cef40716ca 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/no_threadState.test +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/no_threadState.test @@ -4,6 +4,8 @@ # RUN: %python %S/patch-crashlog.py --binary %t.out --crashlog %t.crash --offsets '{"main":20, "bar":9, "foo":16}' --json # RUN: %lldb %t.out -o 'command script import lldb.macosx.crashlog' -o 'crashlog %t.crash' 2>&1 | FileCheck %s +# CHECK: "crashlog" {{.*}} commands have been installed, use the "--help" options on these commands + # CHECK: Thread[0] Crashing Thread Name EXC_BAD_ACCESS (SIGSEGV) (KERN_INVALID_ADDRESS at 0x0000000000000000) # CHECK: [ 0] {{.*}}out`foo + 16 at test.c # CHECK: [ 1] {{.*}}out`bar + 8 at test.c diff --git a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test index df8dcaad4f0ee..4e5e3fc6a5dc0 100644 --- a/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test +++ b/lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test @@ -3,6 +3,8 @@ # RUN: %python %S/patch-crashlog.py --binary %t.out --crashlog %t.crash --offsets '{"main":20, "bar":9, "foo":16}' # RUN: %lldb %t.out -o 'command script import lldb.macosx.crashlog' -o 'crashlog %t.crash' 2>&1 | FileCheck %s +# CHECK: "crashlog" {{.*}} commands have been installed, use the "--help" options on these commands + # CHECK: Thread[0] EXC_BAD_ACCESS (SIGSEGV) (KERN_INVALID_ADDRESS at 0x0000000000000000) # CHECK: [ 0] {{.*}}out`foo + 16 at test.c # CHECK: [ 1] {{.*}}out`bar + 8 at test.c _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
