From: Simon Marchi <simon.marchi@efficios.com>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 1/9] gdb/testsuite/dap: use gdb_assert in gdb.dap/basic-dap.exp
Date: Fri, 6 Jan 2023 13:57:21 -0500 [thread overview]
Message-ID: <20230106185729.42372-2-simon.marchi@efficios.com> (raw)
In-Reply-To: <20230106185729.42372-1-simon.marchi@efficios.com>
Use gdb_assert instead of manual pass/fail.
Change-Id: I71fbc4e37a0a1ef4783056c7424e932651fa397f
---
gdb/testsuite/gdb.dap/basic-dap.exp | 19 +++----------------
1 file changed, 3 insertions(+), 16 deletions(-)
diff --git a/gdb/testsuite/gdb.dap/basic-dap.exp b/gdb/testsuite/gdb.dap/basic-dap.exp
index d3acf0c22c8..c60989d2a6f 100644
--- a/gdb/testsuite/gdb.dap/basic-dap.exp
+++ b/gdb/testsuite/gdb.dap/basic-dap.exp
@@ -75,12 +75,7 @@ set obj [dap_check_request_and_response "reset breakpoint by line number" \
[format {o source [o path [%s]] breakpoints [a [o line [i %d]]]} \
[list s $srcfile] $line]]
set new_line_bpno [dap_get_breakpoint_number $obj]
-
-if {$new_line_bpno == $line_bpno} {
- pass "re-setting kept same breakpoint number"
-} else {
- fail "re-setting kept same breakpoint number"
-}
+gdb_assert {$new_line_bpno == $line_bpno} "re-setting kept same breakpoint number"
# This uses "&address_breakpoint_here" as the address -- this is a
# hack because we know how this is implemented under the hood.
@@ -131,21 +126,13 @@ dap_match_values "global value in main" [lindex $obj 0] \
set obj [dap_request_and_response "evaluate non-existing variable" \
evaluate {o expression [s nosuchvariable]}]
set d [namespace eval ton::2dict [lindex $obj 0]]
-if {[dict get $d success] == "false"} {
- pass "result of invalid request"
-} else {
- fail "result of invalid request"
-}
+gdb_assert { [dict get $d success] == "false" } "result of invalid request"
set obj [dap_check_request_and_response "disassemble one instruction" \
disassemble \
[format {o memoryReference [s %s] instructionCount [i 1]} \
$insn_pc]]
set d [namespace eval ton::2dict [lindex $obj 0]]
-if {[dict exists $d body instructions]} {
- pass "instructions in disassemble output"
-} else {
- fail "instructions in disassemble output"
-}
+gdb_assert { [dict exists $d body instructions] } "instructions in disassemble output"
dap_shutdown
--
2.38.1
next prev parent reply other threads:[~2023-01-06 18:57 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-06 18:57 [PATCH 0/9] Fix gdb.dap/basic-dap.exp for PIE Simon Marchi
2023-01-06 18:57 ` Simon Marchi [this message]
2023-01-25 21:58 ` [PATCH 1/9] gdb/testsuite/dap: use gdb_assert in gdb.dap/basic-dap.exp Tom Tromey
2023-01-06 18:57 ` [PATCH 2/9] gdb/testsuite/dap: prefix some procs with _ Simon Marchi
2023-01-25 21:59 ` Tom Tromey
2023-01-06 18:57 ` [PATCH 3/9] gdb/testsuite/dap: write requests to gdb.log Simon Marchi
2023-01-25 21:59 ` Tom Tromey
2023-01-25 22:01 ` Tom Tromey
2023-01-26 3:01 ` Simon Marchi
2023-01-06 18:57 ` [PATCH 4/9] gdb/testsuite/dap: make dap_request_and_response not catch / issue test result Simon Marchi
2023-01-06 18:57 ` [PATCH 5/9] gdb/testsuite/dap: remove catch from dap_read_event Simon Marchi
2023-01-06 18:57 ` [PATCH 6/9] gdb/testsuite/dap: pass around dicts instead of ton objects Simon Marchi
2023-01-25 22:04 ` Tom Tromey
2023-01-26 3:29 ` Simon Marchi
2023-01-26 14:55 ` Tom Tromey
2023-01-06 18:57 ` [PATCH 7/9] gdb/testsuite/dap: rename dap_read_event to dap_wait_for_event_and_check Simon Marchi
2023-01-06 18:57 ` [PATCH 8/9] gdb/testsuite/dap: make dap_wait_for_event_and_check return preceding messages Simon Marchi
2023-01-06 18:57 ` [PATCH 9/9] gdb/testsuite/dap: fix gdb.dap/basic-dap.exp disassembly test for PIE Simon Marchi
2023-01-25 22:10 ` Tom Tromey
2023-01-26 3:40 ` Simon Marchi
2023-01-26 15:08 ` Tom Tromey
2023-01-26 20:21 ` Simon Marchi
2023-01-16 16:07 ` [PATCH 0/9] Fix gdb.dap/basic-dap.exp " Simon Marchi
2023-01-25 22:10 ` Tom Tromey
2023-01-26 20:22 ` Simon Marchi
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=20230106185729.42372-2-simon.marchi@efficios.com \
--to=simon.marchi@efficios.com \
--cc=gdb-patches@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: link
Be 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).