From b4d069fbeaef8ea8891c13992789e63c51f73a42 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Fri, 19 Nov 2021 17:33:27 +0000 Subject: [PATCH] gdb/testsuite: Remove duplicates in gdb.base/catch-signal.exp When running the testsuite I have the following: Running .../gdb/testsuite/gdb.base/catch-signal.exp ... DUPLICATE: gdb.base/catch-signal.exp: SIGHUP: continue DUPLICATE: gdb.base/catch-signal.exp: SIGHUP: continue DUPLICATE: gdb.base/catch-signal.exp: 1: continue DUPLICATE: gdb.base/catch-signal.exp: 1: continue DUPLICATE: gdb.base/catch-signal.exp: SIGHUP SIGUSR2: continue DUPLICATE: gdb.base/catch-signal.exp: SIGHUP SIGUSR2: continue This patch removes DUPLICATE in gdb.base/catch-signal.exp by explicitly giving names to the offending 'gdb_test "continue"' statements to make them distinct. Tested on x86_64-linux. --- gdb/testsuite/gdb.base/catch-signal.exp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.base/catch-signal.exp b/gdb/testsuite/gdb.base/catch-signal.exp index 00cad1b009a..6569e0c4c55 100644 --- a/gdb/testsuite/gdb.base/catch-signal.exp +++ b/gdb/testsuite/gdb.base/catch-signal.exp @@ -39,7 +39,7 @@ proc test_catch_signal {signame} { gdb_test "handle SIGHUP nostop noprint pass" \ "SIGHUP.*No.*No.*Yes.*" gdb_test "catch signal" "Catchpoint .*" - gdb_test "continue" "Catchpoint .*" + gdb_test "continue" "Catchpoint .*" "continue to first HUP" # Now ensure that the "pass" setting worked, and also that we did not # see gdb's SIGTRAP. @@ -52,7 +52,7 @@ proc test_catch_signal {signame} { gdb_breakpoint ${srcfile}:[gdb_get_line_number "second HUP"] gdb_continue_to_breakpoint "second HUP" gdb_test "catch signal $signame" "Catchpoint .*" - gdb_test "continue" "Catchpoint .*" + gdb_test "continue" "Catchpoint .*" "continue to catch signal $signame" delete_breakpoints # Catch just SIGUSR1 -- but it isn't sent. @@ -83,7 +83,6 @@ proc test_catch_signal {signame} { y gdb_test "catch signal SIGINT" "Catchpoint .*" gdb_test "continue" "Catchpoint .* SIGINT.*" - } } -- 2.30.2