mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-23 03:29:47 +08:00
gdb/testsuite/dap: make dap_request_and_response not catch / issue test result
Following some of my changes, dap_request_and_response was failing and I didn't know why. I think it's better to make it not catch any exception, and just make it do a simple "send request, read response". If an exception is thrown while sending a request or reading a response, things are going really badly, it's not like we'll want to recover from that and continue the test. Change-Id: I27568d3547f753c3a74e3e5a730d38a8caef9356
This commit is contained in:
@ -123,7 +123,7 @@ set obj [dap_check_request_and_response "evaluate global in main" \
|
||||
dap_match_values "global value in main" [lindex $obj 0] \
|
||||
"body result" 25
|
||||
|
||||
set obj [dap_request_and_response "evaluate non-existing variable" \
|
||||
set obj [dap_request_and_response \
|
||||
evaluate {o expression [s nosuchvariable]}]
|
||||
set d [namespace eval ton::2dict [lindex $obj 0]]
|
||||
gdb_assert { [dict get $d success] == "false" } "result of invalid request"
|
||||
|
@ -201,29 +201,16 @@ proc _dap_read_response {cmd num} {
|
||||
}
|
||||
|
||||
# A wrapper for _dap_send_request and _dap_read_response. This sends a
|
||||
# request to gdb and returns the result. NAME is used to issue a pass
|
||||
# or fail; on failure, this always returns an empty string.
|
||||
proc dap_request_and_response {name command {obj {}}} {
|
||||
set result {}
|
||||
if {[catch {
|
||||
set seq [_dap_send_request $command $obj]
|
||||
set result [_dap_read_response $command $seq]
|
||||
} text]} {
|
||||
verbose "reason: $text"
|
||||
fail $name
|
||||
} else {
|
||||
pass $name
|
||||
}
|
||||
return $result
|
||||
# request to gdb and returns the response as a dict.
|
||||
proc dap_request_and_response {command {obj {}}} {
|
||||
set seq [_dap_send_request $command $obj]
|
||||
return [_dap_read_response $command $seq]
|
||||
}
|
||||
|
||||
# Like dap_request_and_response, but also checks that the response
|
||||
# indicates success.
|
||||
# indicates success. NAME is used to issue a test result.
|
||||
proc dap_check_request_and_response {name command {obj {}}} {
|
||||
set result [dap_request_and_response $name $command $obj]
|
||||
if {$result == ""} {
|
||||
return ""
|
||||
}
|
||||
set result [dap_request_and_response $command $obj]
|
||||
set d [namespace eval ton::2dict [lindex $result 0]]
|
||||
if {[dict get $d success] != "true"} {
|
||||
verbose "request failure: $result"
|
||||
|
Reference in New Issue
Block a user