Skip to content

Commit af144d5

Browse files
authored
[Dexter] llvm-lit: Always log DAP messages to stderr (#158586)
This will help diagnose flaky buildbots. The stderr output is only shown by lit if the test fails.
1 parent 3c75065 commit af144d5

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

cross-project-tests/debuginfo-tests/dexter/dex/debugger/DAP.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,17 @@ def _custom_enter(self):
5959
if self.log_file == "-":
6060
self.out_handle = sys.stdout
6161
return
62+
if self.log_file == "-e":
63+
self.out_handle = sys.stderr
64+
return
6265
self.out_handle = open(self.log_file, "w+", encoding="utf-8")
6366

6467
def _custom_exit(self):
65-
if self.out_handle is not None and self.log_file != "-":
68+
if (
69+
self.out_handle is not None
70+
and self.log_file != "-"
71+
and self.log_file != "-e"
72+
):
6673
self.out_handle.close()
6774
self.open = False
6875

cross-project-tests/debuginfo-tests/dexter/dex/debugger/Debuggers.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def add_debugger_tool_base_arguments(parser, defaults):
7474
type=str,
7575
metavar="<filepath>",
7676
default=None,
77-
help="log file for messages between Dexter and the debug adapter; set to '-' to log to stdout",
77+
help="log file for messages between Dexter and the debug adapter; set to '-' to log to stdout, '-e' to log to stderr",
7878
)
7979
dap_group.add_argument(
8080
"--colorize-dap-log",
@@ -186,7 +186,11 @@ def handle_debugger_tool_base_options(context, defaults): # noqa
186186
'<d>could not find</> <r>"{}"</>'.format(options.lldb_executable)
187187
)
188188

189-
if options.dap_message_log is not None and options.dap_message_log != "-":
189+
if (
190+
options.dap_message_log is not None
191+
and options.dap_message_log != "-"
192+
and options.dap_message_log != "-e"
193+
):
190194
options.dap_message_log = os.path.abspath(options.dap_message_log)
191195

192196

cross-project-tests/lit.cfg.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ def configure_dexter_substitutions():
121121
tools.append(
122122
ToolSubst(
123123
"%dexter_lldb_args",
124-
f'--lldb-executable "{lldb_dap_path}" --debugger lldb-dap',
124+
f'--lldb-executable "{lldb_dap_path}" --debugger lldb-dap --dap-message-log=-e',
125125
)
126126
)
127127

@@ -148,7 +148,9 @@ def configure_dexter_substitutions():
148148
dexter_regression_test_c_builder = "clang"
149149
dexter_regression_test_cxx_builder = "clang++"
150150
dexter_regression_test_debugger = "lldb-dap"
151-
dexter_regression_test_additional_flags = f'--lldb-executable "{lldb_dap_path}"'
151+
dexter_regression_test_additional_flags = (
152+
f'--lldb-executable "{lldb_dap_path}" --dap-message-log=-e'
153+
)
152154
dexter_regression_test_c_flags = "-O0 -glldb -std=gnu11"
153155
dexter_regression_test_cxx_flags = "-O0 -glldb -std=gnu++11"
154156

0 commit comments

Comments
 (0)