From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 924223856B4D; Tue, 6 Dec 2022 11:01:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 924223856B4D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1670324515; bh=Q35mDM9qGFeRWz+Kn9B6N/jQ0zQc0OhFG2bHpRYE9C8=; h=From:To:Subject:Date:From; b=CxvwdJRF5ebZLVzhg9/UkisCT9KMIWhg6Qybmobghe0ED9J/cuumglyUzZTOo6KB8 Iprt9NXoN8kTW9NWuSvC+GzHDB9Xeyfe2v12j508jcdH3hveEnaAk0aIIU5zK8p4KN 7mwiBjc9dO1uK9tXj/7omcnBG83C3Mifircszs/A= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Fix test names in gdb.base/longjmp.exp X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: 6e41445bb006f3afc784862f8eb1bf0f2691a94a X-Git-Newrev: 8db40179f0e61c2145a4470afa47fb1945a8d9c8 Message-Id: <20221206110155.924223856B4D@sourceware.org> Date: Tue, 6 Dec 2022 11:01:55 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D8db40179f0e6= 1c2145a4470afa47fb1945a8d9c8 commit 8db40179f0e61c2145a4470afa47fb1945a8d9c8 Author: Tom de Vries Date: Tue Dec 6 12:01:46 2022 +0100 [gdb/testsuite] Fix test names in gdb.base/longjmp.exp =20 When running test-case gdb.base/longjmp.exp, we have: ... PASS: gdb.base/longjmp.exp: next over setjmp (1) ... PASS: gdb.base/longjmp.exp: next over setjmp (2) ... =20 The trailing " (1)" and " (2)" are interpreted as comments rather than = parts of the test name, and therefore this is a duplicate, which is currently= not detected by our duplicate detection mechanism (PR testsuite/29772). =20 Fix the duplicate by using with_test_prefix. =20 Tested on x86_64-linux. Diff: --- gdb/testsuite/gdb.base/longjmp.exp | 111 +++++++++++++++++++++------------= ---- 1 file changed, 63 insertions(+), 48 deletions(-) diff --git a/gdb/testsuite/gdb.base/longjmp.exp b/gdb/testsuite/gdb.base/lo= ngjmp.exp index bd2fc21a442..10e440bfca8 100644 --- a/gdb/testsuite/gdb.base/longjmp.exp +++ b/gdb/testsuite/gdb.base/longjmp.exp @@ -42,30 +42,35 @@ set bp_start_test_3 [gdb_get_line_number "patt3"] # Pattern 1 - simple longjmp. # =20 -delete_breakpoints - -gdb_test "break $bp_start_test_1" \ - "Breakpoint.*at.* file .*$srcfile, line.*$bp_start_test_1.*" \ - "breakpoint at pattern 1 start" -gdb_test "continue" "patt1.*" "continue to breakpoint at pattern 1 start" - -# set safe-net break -gdb_test "break $bp_miss_step_1" \ - "Breakpoint.*at.* file .*$srcfile, line.*$bp_miss_step_1.*" \ - "breakpoint at miss_step_1" - -gdb_test "next" "longjmps\\+\\+;.*" "next over setjmp (1)" -gdb_test "next" "longjmp \\(env, 1\\);.*" "next to longjmp (1)" - -set msg "next over longjmp(1)" -gdb_test_multiple "next" $msg { - -re ".*patt1.*$gdb_prompt $" { - pass $msg - gdb_test "next" "resumes\\+\\+.*" "next into else block (1)" - gdb_test "next" "miss_step_1.*" "next into safety net (1)" +with_test_prefix "pattern 1" { + + with_test_prefix setup { + delete_breakpoints + + gdb_test "break $bp_start_test_1" \ + "Breakpoint.*at.* file .*$srcfile, line.*$bp_start_test_1.*" \ + "breakpoint at pattern start" + gdb_test "continue" "patt1.*" "continue to breakpoint at pattern start" + + # set safe-net break + gdb_test "break $bp_miss_step_1" \ + "Breakpoint.*at.* file .*$srcfile, line.*$bp_miss_step_1.*" \ + "breakpoint at safety net" } - -re "miss_step_1.*$gdb_prompt $" { - fail $msg + + gdb_test "next" "longjmps\\+\\+;.*" "next over setjmp" + gdb_test "next" "longjmp \\(env, 1\\);.*" "next to longjmp" + + set msg "next over longjmp" + gdb_test_multiple "next" $msg { + -re ".*patt1.*$gdb_prompt $" { + pass $msg + gdb_test "next" "resumes\\+\\+.*" "next into else block" + gdb_test "next" "miss_step_1.*" "next into safety net" + } + -re "miss_step_1.*$gdb_prompt $" { + fail $msg + } } } =20 @@ -73,30 +78,35 @@ gdb_test_multiple "next" $msg { # Pattern 2 - longjmp from an inner function. # =20 -delete_breakpoints +with_test_prefix "pattern 2" { + + with_test_prefix setup { + delete_breakpoints =20 -gdb_test "break $bp_start_test_2" \ - "Breakpoint.*at.* file .*$srcfile, line.*$bp_start_test_2.*" \ - "breakpoint at pattern 2 start" -gdb_test "continue" "patt2.*" "continue to breakpoint at pattern 2 start" + gdb_test "break $bp_start_test_2" \ + "Breakpoint.*at.* file .*$srcfile, line.*$bp_start_test_2.*" \ + "breakpoint at pattern start" + gdb_test "continue" "patt2.*" "continue to breakpoint at pattern start" =20 -# set safe-net break -gdb_test "break $bp_miss_step_2" \ - "Breakpoint.*at.* file .*$srcfile, line.*$bp_miss_step_2.*" \ - "breakpoint at miss_step_2" + # set safe-net break + gdb_test "break $bp_miss_step_2" \ + "Breakpoint.*at.* file .*$srcfile, line.*$bp_miss_step_2.*" \ + "breakpoint at safety net" + } =20 -gdb_test "next" "call_longjmp.*" "next over setjmp (2)" + gdb_test "next" "call_longjmp.*" "next over setjmp" =20 -set msg "next over call_longjmp (2)" -gdb_test_multiple "next" $msg { - -re ".*patt2.*$gdb_prompt $" { - pass $msg + set msg "next over call_longjmp" + gdb_test_multiple "next" $msg { + -re ".*patt2.*$gdb_prompt $" { + pass $msg =20 - gdb_test "next" "resumes\\+\\+.*" "next into else block (2)" - gdb_test "next" "miss_step_2.*" "next into safety net (2)" - } - -re "miss_step_2.*$gdb_prompt $" { - fail $msg + gdb_test "next" "resumes\\+\\+.*" "next into else block" + gdb_test "next" "miss_step_2.*" "next into safety net" + } + -re "miss_step_2.*$gdb_prompt $" { + fail $msg + } } } =20 @@ -104,11 +114,16 @@ gdb_test_multiple "next" $msg { # Pattern 3 - setjmp/longjmp inside stepped-over function. # =20 -delete_breakpoints +with_test_prefix "pattern 3" { =20 -gdb_test "break $bp_start_test_3" \ - "Breakpoint.*at.* file .*$srcfile, line.*$bp_start_test_3.*" \ - "breakpoint at pattern 3 start" -gdb_test "continue" "patt3.*" "continue to breakpoint at pattern 3 start" + with_test_prefix setup { + delete_breakpoints =20 -gdb_test "next" "longjmp caught.*" "next over patt3" + gdb_test "break $bp_start_test_3" \ + "Breakpoint.*at.* file .*$srcfile, line.*$bp_start_test_3.*" \ + "breakpoint at pattern start" + gdb_test "continue" "patt3.*" "continue to breakpoint at pattern start" + } + + gdb_test "next" "longjmp caught.*" "next over pattern" +}