From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id D2F8C385842C; Thu, 26 Jan 2023 20:22:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D2F8C385842C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1674764557; bh=3PbQwUntoRuO8ycqJ0EA4k5C/B8nDRlhCev6kDBHIh8=; h=From:To:Subject:Date:From; b=MGWVTY4aGN3dQXNoVfgHpE09hJahjhSklhbyHPFa5xy93bUc/wLxDxysqjVmLVlR5 Bi6Uw48f8LOJpbTff8HVa0sov5B8HQ/LdIizJlG1PXC0FIc6xWYBHbpV6UWIwo+bG6 K91SzjMZdndOhScAyAz4FVzhjZ430N4VWJuUm6qg= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Simon Marchi To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb/testsuite/dap: use gdb_assert in gdb.dap/basic-dap.exp X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: 2b304f501f1fe7ca0a27a6e672fd9cf8f289b4eb X-Git-Newrev: 5dd4f3585df57662e4b77d2b22223ba40395943c Message-Id: <20230126202237.D2F8C385842C@sourceware.org> Date: Thu, 26 Jan 2023 20:22:37 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D5dd4f3585df5= 7662e4b77d2b22223ba40395943c commit 5dd4f3585df57662e4b77d2b22223ba40395943c Author: Simon Marchi Date: Fri Jan 6 10:07:21 2023 -0500 gdb/testsuite/dap: use gdb_assert in gdb.dap/basic-dap.exp =20 Use gdb_assert instead of manual pass/fail. =20 Change-Id: I71fbc4e37a0a1ef4783056c7424e932651fa397f Diff: --- 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/ba= sic-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 breakpoin= t 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 =3D=3D $line_bpno} { - pass "re-setting kept same breakpoint number" -} else { - fail "re-setting kept same breakpoint number" -} +gdb_assert {$new_line_bpno =3D=3D $line_bpno} "re-setting kept same breakp= oint number" =20 # 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] =3D=3D "false"} { - pass "result of invalid request" -} else { - fail "result of invalid request" -} +gdb_assert { [dict get $d success] =3D=3D "false" } "result of invalid req= uest" =20 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 disasse= mble output" =20 dap_shutdown