diff options
| -rw-r--r-- | gdb/testsuite/gdb.dap/type_check.exp | 3 | ||||
| -rw-r--r-- | gdb/testsuite/lib/dap-support.exp | 22 |
2 files changed, 18 insertions, 7 deletions
diff --git a/gdb/testsuite/gdb.dap/type_check.exp b/gdb/testsuite/gdb.dap/type_check.exp index cda01299925..e6c9d73d871 100644 --- a/gdb/testsuite/gdb.dap/type_check.exp +++ b/gdb/testsuite/gdb.dap/type_check.exp @@ -26,6 +26,9 @@ set remote_python_file \ [gdb_remote_download host ${srcdir}/${subdir}/${gdb_test_file_name}.py] gdb_test_no_output "source ${remote_python_file}" "load python file" +set logfile [new_dap_log_file] +gdb_test_no_output "set debug dap-log-file $logfile" "set dap log file" + gdb_test_multiple "python check_everything()" "type checker" { -re -wrap "OK" { pass $gdb_test_name diff --git a/gdb/testsuite/lib/dap-support.exp b/gdb/testsuite/lib/dap-support.exp index 979dfa2cd73..31f036eddf2 100644 --- a/gdb/testsuite/lib/dap-support.exp +++ b/gdb/testsuite/lib/dap-support.exp @@ -26,6 +26,19 @@ set dap_gdb_instance 0 # is restarted. set dap_seq 1 +# Return the current DAP log file. +proc current_dap_log_file {} { + global dap_gdb_instance + return [standard_output_file "dap.log.$dap_gdb_instance"] +} + +# Return a new DAP log file. +proc new_dap_log_file {} { + global dap_gdb_instance + incr dap_gdb_instance + return [current_dap_log_file] +} + # Start gdb using the DAP interpreter. proc dap_gdb_start {} { # Keep track of the number of times GDB has been launched. @@ -34,13 +47,10 @@ proc dap_gdb_start {} { gdb_stdin_log_init - global dap_gdb_instance - incr dap_gdb_instance - global GDBFLAGS stty_init save_vars { GDBFLAGS stty_init } { set stty_init "-echo raw" - set logfile [standard_output_file "dap.log.$dap_gdb_instance"] + set logfile [new_dap_log_file] append GDBFLAGS " -iex \"set debug dap-log-file $logfile\" -q -i=dap" set res [gdb_spawn] if {$res != 0} { @@ -337,9 +347,7 @@ proc dap_target_remote {target} { # Read the most recent DAP log file and check it for exceptions. proc dap_check_log_file {} { - global dap_gdb_instance - - set fd [open [standard_output_file "dap.log.$dap_gdb_instance"]] + set fd [open [current_dap_log_file]] set contents [read $fd] close $fd |