[pushed] [gdb/testsuite] Fix tcl error in gdb.dap/sources.exp

[pushed] [gdb/testsuite] Fix tcl error in gdb.dap/sources.exp

[Tom de Vries]

With test-case gdb.dap/sources.exp, I run into:
...
{"request_seq": 4, "type": "response", "command": "source", \
  "success": false, "message": "notStopped", \
  "seq": 11}FAIL: gdb.dap/sources.exp: get source success
ERROR: tcl error sourcing gdb.dap/sources.exp.
ERROR: key "body" not known in dictionary
...

The FAIL has been filed as PR dap/31374.

The ERROR happens because after the FAIL, dap_check_request_and_response
returns "", and the test-case doesn't check for that.

Fix this by checking for $obj != "" in the test-case.

Tested on x86_64-linux.
---
 gdb/testsuite/gdb.dap/sources.exp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.dap/sources.exp b/gdb/testsuite/gdb.dap/sources.exp
index b60681160af..f601190d6f5 100644
--- a/gdb/testsuite/gdb.dap/sources.exp
+++ b/gdb/testsuite/gdb.dap/sources.exp
@@ -49,8 +49,10 @@ if {$path == ""} {
     set obj [dap_check_request_and_response "get source" source \
 		 [format {o source [o path [s %s]] \
 			    sourceReference [i 0]} $path]]
-    set text [dict get [lindex $obj 0] body content]
-    gdb_assert {[string first "Distinguishing comment" $text] != -1}
+    if { $obj != "" } {
+	set text [dict get [lindex $obj 0] body content]
+	gdb_assert {[string first "Distinguishing comment" $text] != -1}
+    }
 }
 
 

base-commit: 7e4208a3f5d60f43b4a8f02e583fa950b599cd00
-- 
2.35.3

Re: [pushed] [gdb/testsuite] Fix tcl error in gdb.dap/sources.exp

[Tom Tromey]

>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes:

Tom> Fix this by checking for $obj != "" in the test-case.

I think this obscures the real failure that you found in the next patch...

Tom> -    set text [dict get [lindex $obj 0] body content]
Tom> -    gdb_assert {[string first "Distinguishing comment" $text] != -1}
Tom> +    if { $obj != "" } {
Tom> +	set text [dict get [lindex $obj 0] body content]
Tom> +	gdb_assert {[string first "Distinguishing comment" $text] != -1}
Tom> +    }

... with this change in place, it seems like a bug in the code will just
silently pass.

The DAP tests aren't always super robust against Tcl errors, which is
sometimes annoying.

Tom

Re: [pushed] [gdb/testsuite] Fix tcl error in gdb.dap/sources.exp

[Tom de Vries]

On 2/13/24 15:50, Tom Tromey wrote:
>>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes:
> 
> Tom> Fix this by checking for $obj != "" in the test-case.
> 
> I think this obscures the real failure that you found in the next patch...
> 
> Tom> -    set text [dict get [lindex $obj 0] body content]
> Tom> -    gdb_assert {[string first "Distinguishing comment" $text] != -1}
> Tom> +    if { $obj != "" } {
> Tom> +	set text [dict get [lindex $obj 0] body content]
> Tom> +	gdb_assert {[string first "Distinguishing comment" $text] != -1}
> Tom> +    }
> 
> ... with this change in place, it seems like a bug in the code will just
> silently pass.
> 

I don't think so, the FAIL is there with or without this patch.

Thanks,
- Tom

> The DAP tests aren't always super robust against Tcl errors, which is
> sometimes annoying.