From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id cMSLJlCLmmEyUQAAWB0awg (envelope-from ) for ; Sun, 21 Nov 2021 13:09:20 -0500 Received: by simark.ca (Postfix, from userid 112) id 976E81F0CE; Sun, 21 Nov 2021 13:09:20 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-3.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 11C9F1EDF0 for ; Sun, 21 Nov 2021 13:09:20 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id AAEAD385841F for ; Sun, 21 Nov 2021 18:09:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org AAEAD385841F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637518159; bh=cJRmXi5IzhwqVH61RhuSteDlZcD4goNZS3kXiCugSNw=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=UY9rUg7KebzDn+8hMC6vNB08AZiSMIIRKhdorHr6wfKDhAwIoGyYBQVgLcDacRQKQ WZf3nUzaWYCb0jfcblGC+p0mmrn2THRTetXLeQC5HIZvxEV0qJnE7yOMVGxer2KZam XWE6ZZupAS0XKjMQTIqL8J7VtZ/APVUA3WSRK89E= Received: from lndn.lancelotsix.com (vps-42846194.vps.ovh.net [IPv6:2001:41d0:801:2000::2400]) by sourceware.org (Postfix) with ESMTPS id 4191E3858416 for ; Sun, 21 Nov 2021 17:58:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4191E3858416 Received: from Plymouth.lan (unknown [IPv6:2a02:390:9086:0:e409:90b0:99cc:9f98]) by lndn.lancelotsix.com (Postfix) with ESMTPSA id 413A58198D; Sun, 21 Nov 2021 17:57:58 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 26/29] gdb/testsuite: Remove duplicates from gdb.base/call-signal-resume.exp Date: Sun, 21 Nov 2021 17:56:33 +0000 Message-Id: <20211121175636.779325-27-lsix@lancelotsix.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211121175636.779325-1-lsix@lancelotsix.com> References: <20211121175636.779325-1-lsix@lancelotsix.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.11 (lndn.lancelotsix.com [0.0.0.0]); Sun, 21 Nov 2021 17:58:00 +0000 (UTC) X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Lancelot SIX via Gdb-patches Reply-To: Lancelot SIX Cc: Lancelot SIX Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" 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 7218858135c..a7e9c203ca7 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.33.1