Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,17 @@ def _custom_enter(self):
if self.log_file == "-":
self.out_handle = sys.stdout
return
if self.log_file == "-e":
self.out_handle = sys.stderr
return
self.out_handle = open(self.log_file, "w+", encoding="utf-8")

def _custom_exit(self):
if self.out_handle is not None and self.log_file != "-":
if (
self.out_handle is not None
and self.log_file != "-"
and self.log_file != "-e"
):
self.out_handle.close()
self.open = False

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def add_debugger_tool_base_arguments(parser, defaults):
type=str,
metavar="<filepath>",
default=None,
help="log file for messages between Dexter and the debug adapter; set to '-' to log to stdout",
help="log file for messages between Dexter and the debug adapter; set to '-' to log to stdout, '-e' to log to stderr",
)
dap_group.add_argument(
"--colorize-dap-log",
Expand Down Expand Up @@ -186,7 +186,11 @@ def handle_debugger_tool_base_options(context, defaults): # noqa
'<d>could not find</> <r>"{}"</>'.format(options.lldb_executable)
)

if options.dap_message_log is not None and options.dap_message_log != "-":
if (
options.dap_message_log is not None
and options.dap_message_log != "-"
and options.dap_message_log != "-e"
):
options.dap_message_log = os.path.abspath(options.dap_message_log)


Expand Down
6 changes: 4 additions & 2 deletions cross-project-tests/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def configure_dexter_substitutions():
tools.append(
ToolSubst(
"%dexter_lldb_args",
f'--lldb-executable "{lldb_dap_path}" --debugger lldb-dap',
f'--lldb-executable "{lldb_dap_path}" --debugger lldb-dap --dap-message-log=-e',
)
)

Expand All @@ -148,7 +148,9 @@ def configure_dexter_substitutions():
dexter_regression_test_c_builder = "clang"
dexter_regression_test_cxx_builder = "clang++"
dexter_regression_test_debugger = "lldb-dap"
dexter_regression_test_additional_flags = f'--lldb-executable "{lldb_dap_path}"'
dexter_regression_test_additional_flags = (
f'--lldb-executable "{lldb_dap_path}" --dap-message-log=-e'
)
dexter_regression_test_c_flags = "-O0 -glldb -std=gnu11"
dexter_regression_test_cxx_flags = "-O0 -glldb -std=gnu++11"

Expand Down
Loading