From 8cc261b7814cdd04735be2e7af1fafc19df1b3b6 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sun, 21 Nov 2021 15:22:49 +0000 Subject: [PATCH] gdb/testsuite: Remove duplicates from gdb.base/call-signal-resume.exp MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When running the testsuite, I have: Running .../gdb/testsuite/gdb.base/call-signal-resume.exp ... DUPLICATE: gdb.base/call-signal-resume.exp: dummy stack frame number DUPLICATE: gdb.base/call-signal-resume.exp: set confirm off DUPLICATE: gdb.base/call-signal-resume.exp: return This is due to the fact that a pattern was probably copy/pasted to re-use the logic while not adjusting the test names to avoid the duplication. Fix by removing the redundant tests ('set confirm off' only needs to be used once) and adjusting the test names where appropriate. Tested on x86_64-linux. --- gdb/testsuite/gdb.base/call-signal-resume.exp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp index 011ca85a418..5b3f10504a2 100644 --- a/gdb/testsuite/gdb.base/call-signal-resume.exp +++ b/gdb/testsuite/gdb.base/call-signal-resume.exp @@ -116,18 +116,17 @@ gdb_test "call null_hand_call ()" "Breakpoint \[0-9\]*, null_hand_call.*" \ set frame_number [get_dummy_frame_number] if { "$frame_number" == "" } { - fail "dummy stack frame number" + fail "dummy stack frame number, two" setup_xfail "*-*-*" # Need something. set frame_number 0 } else { - pass "dummy stack frame number" + pass "dummy stack frame number, two" } # Pop the dummy frame. gdb_test "frame $frame_number" ".*" -gdb_test_no_output "set confirm off" -gdb_test "return" "" +gdb_test "return" "" "return, two" # Continue again, this time we should get to the signal handler. -- 2.30.2