[Bug testsuite/31382] [gdb/testsuite] 2 errors instead of 1 reported by _dap_read_json

["vries at gcc dot gnu.org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=31382

--- Comment #1 from Tom de Vries <vries at gcc dot gnu.org> ---
Fixed by:
...
diff --git a/gdb/testsuite/lib/dap-support.exp
b/gdb/testsuite/lib/dap-support.exp
index 979dfa2cd73..e9595a85418 100644
--- a/gdb/testsuite/lib/dap-support.exp
+++ b/gdb/testsuite/lib/dap-support.exp
@@ -137,6 +137,8 @@ proc dap_send_request {command {obj {}}} {
 # "last_ton" will be set to the TON form of the result.
 proc _dap_read_json {} {
     set length ""
+    set seen_timeout 0
+    set seen_eof 0
     gdb_expect {
        -re "^Content-Length: (\[0-9\]+)\r\n" {
            set length $expect_out(1,string)
@@ -150,13 +152,20 @@ proc _dap_read_json {} {
            # Done.
        }
        timeout {
-           error "timeout reading json header"
+           set seen_timeout 1
        }
        eof {
-           error "eof reading json header"
+           set seen_eof 1
        }
     }

+    if {$seen_timeout} {
+       error "timeout reading json header"     
+    }
+    if {$seen_eof} {
+       error "eof reading json header"
+    }
+
     if {$length == ""} {
        error "didn't find content-length"
     }
...
which gives us:
...
ERROR: tcl error sourcing /data/vries/gdb/src/gdb/testsuite/gdb.dap/eof.exp.
ERROR: timeout reading json header
    while executing
"error "timeout reading json header"    "
    (procedure "_dap_read_json" line 26)
    invoked from within
"_dap_read_json"
    (procedure "_dap_wait_for_event" line 7)
    invoked from within
"_dap_wait_for_event "initialized""
    (file "/data/vries/gdb/src/gdb/testsuite/gdb.dap/eof.exp" line 34)
    invoked from within
"source /data/vries/gdb/src/gdb/testsuite/gdb.dap/eof.exp"
    ("uplevel" body line 1)
    invoked from within
"uplevel #0 source /data/vries/gdb/src/gdb/testsuite/gdb.dap/eof.exp"
    invoked from within
"catch "uplevel #0 source $test_file_name""
...

There's another gdb_expect in _dap_read_json that looks like it needs the same
treatment.

-- 
You are receiving this mail because:
You are on the CC list for the bug.