kastiglione updated this revision to Diff 406548.
kastiglione added a comment.
Update tests
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D119155/new/
https://reviews.llvm.org/D119155
Files:
lldb/bindings/python/createPythonInit.py
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
Index: lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test
===================================================================
--- lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test
+++ 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
Index: lldb/test/Shell/ScriptInterpreter/Python/Crashlog/no_threadState.test
===================================================================
--- lldb/test/Shell/ScriptInterpreter/Python/Crashlog/no_threadState.test
+++ 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
Index: lldb/test/Shell/ScriptInterpreter/Python/Crashlog/json.test
===================================================================
--- lldb/test/Shell/ScriptInterpreter/Python/Crashlog/json.test
+++ 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
Index: lldb/test/Shell/Heap/heap-cstr.test
===================================================================
--- lldb/test/Shell/Heap/heap-cstr.test
+++ 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) -> {{.*}}
Index: lldb/examples/python/crashlog.py
===================================================================
--- lldb/examples/python/crashlog.py
+++ lldb/examples/python/crashlog.py
@@ -1247,3 +1247,5 @@
'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.')
Index: lldb/bindings/python/createPythonInit.py
===================================================================
--- lldb/bindings/python/createPythonInit.py
+++ lldb/bindings/python/createPythonInit.py
@@ -10,6 +10,14 @@
script = """__all__ = [{import_names}]
for x in __all__:
__import__('lldb.{pkg_name}.' + x)
+
+def __lldb_init_module(debugger, internal_dict):
+ import lldb
+ for x in __all__:
+ submodule = getattr(lldb.{pkg_name}, x)
+ lldb_init = getattr(submodule, '__lldb_init_module', None)
+ if lldb_init:
+ lldb_init(debugger, internal_dict)
""".format(import_names=importNames, pkg_name=pkgRelDir.replace("/", "."))
pkgIniFile = os.path.normpath(os.path.join(pkgRelDir, "__init__.py"))
Index: lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test
===================================================================
--- lldb/test/Shell/ScriptInterpreter/Python/Crashlog/text.test
+++ 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
Index: lldb/test/Shell/ScriptInterpreter/Python/Crashlog/no_threadState.test
===================================================================
--- lldb/test/Shell/ScriptInterpreter/Python/Crashlog/no_threadState.test
+++ 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
Index: lldb/test/Shell/ScriptInterpreter/Python/Crashlog/json.test
===================================================================
--- lldb/test/Shell/ScriptInterpreter/Python/Crashlog/json.test
+++ 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
Index: lldb/test/Shell/Heap/heap-cstr.test
===================================================================
--- lldb/test/Shell/Heap/heap-cstr.test
+++ 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) -> {{.*}}
Index: lldb/examples/python/crashlog.py
===================================================================
--- lldb/examples/python/crashlog.py
+++ lldb/examples/python/crashlog.py
@@ -1247,3 +1247,5 @@
'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.')
Index: lldb/bindings/python/createPythonInit.py
===================================================================
--- lldb/bindings/python/createPythonInit.py
+++ lldb/bindings/python/createPythonInit.py
@@ -10,6 +10,14 @@
script = """__all__ = [{import_names}]
for x in __all__:
__import__('lldb.{pkg_name}.' + x)
+
+def __lldb_init_module(debugger, internal_dict):
+ import lldb
+ for x in __all__:
+ submodule = getattr(lldb.{pkg_name}, x)
+ lldb_init = getattr(submodule, '__lldb_init_module', None)
+ if lldb_init:
+ lldb_init(debugger, internal_dict)
""".format(import_names=importNames, pkg_name=pkgRelDir.replace("/", "."))
pkgIniFile = os.path.normpath(os.path.join(pkgRelDir, "__init__.py"))
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
