Hi, Sergey,
thanks for the patch! LGTM
Sergey
This patch sorts the commands for extensions' initialization
alphabetically. Also, it fixes the typo in the lldb extension.
This allows enabling the loading test for LLDB as well.
---
src/luajit-gdb.py | 8 ++---
src/luajit_lldb.py | 8 ++---
.../debug-extension-tests.py | 30 +++++++++----------
3 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/src/luajit-gdb.py b/src/luajit-gdb.py
index dab07b35..be67bf18 100644
--- a/src/luajit-gdb.py
+++ b/src/luajit-gdb.py
@@ -872,12 +872,12 @@ def init(commands):
def load(event=None):
init({
'lj-arch': LJDumpArch,
- 'lj-tv': LJDumpTValue,
- 'lj-str': LJDumpString,
- 'lj-tab': LJDumpTable,
+ 'lj-gc': LJGC,
'lj-stack': LJDumpStack,
'lj-state': LJState,
- 'lj-gc': LJGC,
+ 'lj-str': LJDumpString,
+ 'lj-tab': LJDumpTable,
+ 'lj-tv': LJDumpTValue,
})
diff --git a/src/luajit_lldb.py b/src/luajit_lldb.py
index 218cc8d1..7668a94c 100644
--- a/src/luajit_lldb.py
+++ b/src/luajit_lldb.py
@@ -958,7 +958,7 @@ def register_commands(debugger, commands):
cmd=cls.command,
)
)
- print('{cmd} command intialized'.format(cmd=cls.command))
+ print('{cmd} command initialized'.format(cmd=cls.command))
def configure(debugger):
@@ -986,12 +986,12 @@ def configure(debugger):
def __lldb_init_module(debugger, internal_dict):
configure(debugger)
register_commands(debugger, {
- 'lj-tv': LJDumpTValue,
- 'lj-state': LJState,
'lj-arch': LJDumpArch,
'lj-gc': LJGC,
+ 'lj-stack': LJDumpStack,
+ 'lj-state': LJState,
'lj-str': LJDumpString,
'lj-tab': LJDumpTable,
- 'lj-stack': LJDumpStack,
+ 'lj-tv': LJDumpTValue,
})
print('luajit_lldb.py is successfully loaded')
diff --git a/test/tarantool-debugger-tests/debug-extension-tests.py b/test/tarantool-debugger-tests/debug-extension-tests.py
index 11c2492b..f3ce3ced 100644
--- a/test/tarantool-debugger-tests/debug-extension-tests.py
+++ b/test/tarantool-debugger-tests/debug-extension-tests.py
@@ -125,22 +125,20 @@ class TestCaseBase(unittest.TestCase):
self.assertRegex(self.output, self.pattern.strip())
-# FIXME: Skip for LLDB since it has different order.
-if not LLDB:
- class TestLoad(TestCaseBase):
- extension_cmds = ''
- location = 'lj_cf_print'
- lua_script = 'print(1)'
- pattern = (
- r'lj-arch command initialized\n'
- r'lj-tv command initialized\n'
- r'lj-str command initialized\n'
- r'lj-tab command initialized\n'
- r'lj-stack command initialized\n'
- r'lj-state command initialized\n'
- r'lj-gc command initialized\n'
- r'.*is successfully loaded'
- )
+class TestLoad(TestCaseBase):
+ extension_cmds = ''
+ location = 'lj_cf_print'
+ lua_script = 'print(1)'
+ pattern = (
+ r'lj-arch command initialized\n'
+ r'lj-gc command initialized\n'
+ r'lj-stack command initialized\n'
+ r'lj-state command initialized\n'
+ r'lj-str command initialized\n'
+ r'lj-tab command initialized\n'
+ r'lj-tv command initialized\n'
+ r'.*is successfully loaded'
+ )
class TestLJArch(TestCaseBase):