diff --git a/debuginfo-tests/dexter/dex/debugger/Debuggers.py b/debuginfo-tests/dexter/dex/debugger/Debuggers.py --- a/debuginfo-tests/dexter/dex/debugger/Debuggers.py +++ b/debuginfo-tests/dexter/dex/debugger/Debuggers.py @@ -41,7 +41,7 @@ def _warn_meaningless_option(context, option): - if context.options.list_debuggers: + if hasattr(context.options, 'list_debuggers'): return warn(context, diff --git a/debuginfo-tests/dexter/dex/tools/test/Tool.py b/debuginfo-tests/dexter/dex/tools/test/Tool.py --- a/debuginfo-tests/dexter/dex/tools/test/Tool.py +++ b/debuginfo-tests/dexter/dex/tools/test/Tool.py @@ -58,7 +58,7 @@ if self.error: script_error = (' : {}'.format( - self.error.script_error.splitlines()[0].decode()) if getattr( + self.error.script_error.splitlines()[0]) if getattr( self.error, 'script_error', None) else '') error = ' [{}{}]'.format( diff --git a/debuginfo-tests/lit.cfg.py b/debuginfo-tests/lit.cfg.py --- a/debuginfo-tests/lit.cfg.py +++ b/debuginfo-tests/lit.cfg.py @@ -104,7 +104,7 @@ 'dexter', 'dexter.py') dexter_test_cmd = '"{}" "{}" test'.format(config.python3_executable, dexter_path) if lldb_path is not None: - dexter_test_cmd += ' --lldb-executable {}'.format(lldb_path) + dexter_test_cmd += ' --lldb-executable "{}"'.format(lldb_path) tools.append(ToolSubst('%dexter', dexter_test_cmd)) # For testing other bits of dexter that aren't under the "test" subcommand,