public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Simon Marchi <simark@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb/testsuite/dap: make dap_request_and_response not catch / issue test result Date: Thu, 26 Jan 2023 20:22:53 +0000 (GMT) [thread overview] Message-ID: <20230126202253.1197B3858022@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2e9a03fd2e20f9d0d3ddb340ba248bfb1d5ed521 commit 2e9a03fd2e20f9d0d3ddb340ba248bfb1d5ed521 Author: Simon Marchi <simon.marchi@efficios.com> Date: Fri Jan 6 11:09:00 2023 -0500 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 Diff: --- gdb/testsuite/gdb.dap/basic-dap.exp | 2 +- gdb/testsuite/lib/dap-support.exp | 25 ++++++------------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/gdb/testsuite/gdb.dap/basic-dap.exp b/gdb/testsuite/gdb.dap/basic-dap.exp index c60989d2a6f..af55d19349f 100644 --- a/gdb/testsuite/gdb.dap/basic-dap.exp +++ b/gdb/testsuite/gdb.dap/basic-dap.exp @@ -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" diff --git a/gdb/testsuite/lib/dap-support.exp b/gdb/testsuite/lib/dap-support.exp index 94a0d27c8a8..bc99f0182a7 100644 --- a/gdb/testsuite/lib/dap-support.exp +++ b/gdb/testsuite/lib/dap-support.exp @@ -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"
reply other threads:[~2023-01-26 20:22 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20230126202253.1197B3858022@sourceware.org \ --to=simark@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).