From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1879) id 622B838518BE; Thu, 24 Nov 2022 15:23:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 622B838518BE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669303420; bh=6trpB1C2p8gr10L7WkjZ7TbL5nWAi3gt2AKJhQYBcTY=; h=From:To:Subject:Date:From; b=niKSw9IRKxs5DGzV2xtvo2dixdpU/AFUusChA4gYCb8Te6lSmxzrZL6In1SuO3DrI xjwTfBnBbaic11jSuWYBUNWiyolqDNeAIDtqI6HsKCsUHCKbmi+YKTfG2tSeid5jCI FM/QTYpLIIGjLIIvHGfgyTbv8vCu0C6nP88SKdiU= 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_break_default X-Act-Checkin: binutils-gdb X-Git-Author: Simon Marchi X-Git-Refname: refs/heads/master X-Git-Oldrev: c8a48df4f1ae49a5a0125a9adb5558683cd67fd7 X-Git-Newrev: 9df9cfe23ccc3c6d3ba780529b11e6e756a753fb Message-Id: <20221124152340.622B838518BE@sourceware.org> Date: Thu, 24 Nov 2022 15:23:40 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D9df9cfe23ccc= 3c6d3ba780529b11e6e756a753fb commit 9df9cfe23ccc3c6d3ba780529b11e6e756a753fb Author: Simon Marchi Date: Wed Nov 23 13:39:55 2022 -0500 gdb/testsuite/gdb.base/break.exp: split test_break_default =20 One special thing here is that the part just above this one, that sets catchpoints and verifies they are not hit, requires that we resume execution to verify that the catchpoints are indeed not hit. I guess it was previously achieved by the until command, but it doesn't happen now that the until is moved into test_break_default. Add a gdb_continue_to_end after setting the catchpoints. If any catchpoint were to be hit, it would catch the problem. =20 Change-Id: I5d4b43da91886b1beda9f6e56b05aa04331a9c05 Approved-By: Kevin Buettner Diff: --- gdb/testsuite/gdb.base/break.exp | 62 ++++++++++++++++++++++++------------= ---- 1 file changed, 37 insertions(+), 25 deletions(-) diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/brea= k.exp index e8762ffa664..b4d12cb56a9 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -492,6 +492,8 @@ gdb_test "catch vfork" "Catchpoint \[0-9\]+ \\(vfork\\)= " \ gdb_test "catch exec" "Catchpoint \[0-9\]+ \\(exec\\)" \ "set catch exec, never expected to trigger" =20 +gdb_continue_to_end + # Verify that GDB responds gracefully when asked to set a breakpoint # on a nonexistent source line. # @@ -500,36 +502,46 @@ gdb_test "break 999" \ "No line 999 in the current file." \ "break on non-existent source line" =20 -# Run to the desired default location. If not positioned here, the -# tests below don't work. -# -gdb_test "until $bp_location1" "main .* at .*:$bp_location1.*" \ - "until bp_location1" +proc_with_prefix test_break_default {} { + clean_restart break =20 -# Verify that GDB allows one to just say "break", which is treated -# as the "default" breakpoint. Note that GDB gets cute when printing -# the informational message about other breakpoints at the same -# location. We'll hit that bird with this stone too. -# -gdb_test "break" "Breakpoint \[0-9\]*.*" \ - "break on default location, 1st time" + if ![runto_main] then { + return + } =20 -gdb_test "break" \ - "Note: breakpoint \[0-9\]* also set at .*Breakpoint \[0-9\]*.*" \ - "break on default location, 2nd time" + # Run to the desired default location. If not positioned here, the + # tests below don't work. + # + gdb_test "until $::bp_location1" "main .* at .*:$::bp_location1.*" \ + "until bp_location1" + + # Verify that GDB allows one to just say "break", which is treated + # as the "default" breakpoint. Note that GDB gets cute when printing + # the informational message about other breakpoints at the same + # location. We'll hit that bird with this stone too. + # + gdb_test "break" "Breakpoint \[0-9\]*.*" \ + "break on default location, 1st time" =20 -gdb_test "break" \ - "Note: breakpoints \[0-9\]* and \[0-9\]* also set at .*Breakpoint \[0-= 9\]*.*" \ - "break on default location, 3rd time" + gdb_test "break" \ + "Note: breakpoint \[0-9\]* also set at .*Breakpoint \[0-9\]*.*" \ + "break on default location, 2nd time" =20 -gdb_test "break" \ - "Note: breakpoints \[0-9\]*, \[0-9\]* and \[0-9\]* also set at .*Break= point \[0-9\]*.*" \ - "break on default location, 4th time" + gdb_test "break" \ + "Note: breakpoints \[0-9\]* and \[0-9\]* also set at .*Breakpoint \[0-9\]= *.*" \ + "break on default location, 3rd time" + + gdb_test "break" \ + "Note: breakpoints \[0-9\]*, \[0-9\]* and \[0-9\]* also set at .*Breakpoi= nt \[0-9\]*.*" \ + "break on default location, 4th time" + + # Check setting a breakpoint at the default location with a condition = attached. + gdb_test "break if (1)" \ + "Note: breakpoints \[0-9\]*, \[0-9\]*, \[0-9\]* and \[0-9\]* also set at = .*Breakpoint \[0-9\]*.*" \ + "break on the default location, 5th time, but with a condition" +} =20 -# Check setting a breakpoint at the default location with a condition atta= ched. -gdb_test "break if (1)" \ - "Note: breakpoints \[0-9\]*, \[0-9\]*, \[0-9\]* and \[0-9\]* also set = at .*Breakpoint \[0-9\]*.*" \ - "break on the default location, 5th time, but with a condition" +test_break_default =20 # Verify that a "silent" breakpoint can be set, and that GDB is indeed # "silent" about its triggering.