From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id DBC383830B0B; Thu, 24 Nov 2022 15:23:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DBC383830B0B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669303384; bh=TqSs7AHZc1dJ6hlzJkL8EtEaHi+vM1QUc9APA76mhQg=; h=From:To:Subject:Date:From; b=gIK7Hs3JMJxBXOraw3RiVy7LUcJDa3a9Cf5djFMBnmtWuOCOsSp8JHZ+fjQPjlCkq zmcl0u6q4RSo1F4wL6MNJcPPrpYy/t9gr9skXltgEBx8Ob5AS3sgdRKHFEliVXCCXJ vdVR2ZQOAUe+thvsR1RBAnpPWwH1tjRcvrbz2QY4= 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/gdb.base/break.exp: split test_rbreak_shlib X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: b6cb5e17b84787f6832e2d35602dd17ed3855e62 X-Git-Newrev: 45c4b4bc12ea1c81a72f3cd379d34b55cfc517ff Message-Id: <20221124152304.DBC383830B0B@sourceware.org> Date: Thu, 24 Nov 2022 15:23:04 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D45c4b4bc12ea= 1c81a72f3cd379d34b55cfc517ff commit 45c4b4bc12ea1c81a72f3cd379d34b55cfc517ff Author: Simon Marchi Date: Wed Nov 23 13:39:48 2022 -0500 gdb/testsuite/gdb.base/break.exp: split test_rbreak_shlib =20 Change-Id: I130e8914c2713095aab03e84aba1481b4c7af978 Approved-By: Kevin Buettner Diff: --- gdb/testsuite/gdb.base/break.exp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/brea= k.exp index be349d9e7ea..a9728798fab 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -835,9 +835,6 @@ gdb_test_multiple "continue" \ } } =20 -clean_restart breako2 - -# # test that 'rbreak' on a symbol that may be from a shared library doesn't # cause a "Junk at end of arguments." error. # @@ -846,28 +843,31 @@ clean_restart breako2 # Note that this test won't necessarily choke on all targets even if # all the rbreak issue is present. rbreak needs to match and set a # breakpoint on a symbol causes 'break' to choke. -# =20 -gdb_test_no_output "set breakpoint pending on" "rbreak junk pending setup" +proc_with_prefix test_rbreak_shlib {} { + clean_restart breako2 =20 -# We expect at least one breakpoint to be set when we "rbreak main". -gdb_test "rbreak main" \ - ".*Breakpoint.*at.* file .*$srcfile, line.*" \ - "rbreak junk set breakpoint" + gdb_test_no_output "set breakpoint pending on" "rbreak junk pending se= tup" =20 -# Run to a breakpoint. Fail if we see "Junk at end of arguments". -gdb_run_cmd + # We expect at least one breakpoint to be set when we "rbreak main". + gdb_test "rbreak main" \ + ".*Breakpoint.*at.* file .*$::srcfile, line.*" =20 -set test "rbreak junk" -gdb_test_multiple "" $test { - -re "Junk at end of arguments" { - fail $test - } - -re ".*Breakpoint \[0-9\]+,.*$gdb_prompt $" { - pass $test + # Run to a breakpoint. Fail if we see "Junk at end of arguments". + gdb_run_cmd + + gdb_test_multiple "" "rbreak junk" { + -re -wrap "Junk at end of arguments.*" { + fail $gdb_test_name + } + -re -wrap ".*Breakpoint \[0-9\]+,.*" { + pass $gdb_test_name + } } } =20 +test_rbreak_shlib + # Test break via convenience variable with file name =20 proc_with_prefix test_break_file_line_convenience_var {} {