From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id kJ+oE4aJmmEyUQAAWB0awg (envelope-from ) for ; Sun, 21 Nov 2021 13:01:42 -0500 Received: by simark.ca (Postfix, from userid 112) id 4E7131F0CE; Sun, 21 Nov 2021 13:01:42 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.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 CD6AA1EDF0 for ; Sun, 21 Nov 2021 13:01:41 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 71A9E3858010 for ; Sun, 21 Nov 2021 18:01:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 71A9E3858010 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637517701; bh=eQiiUSqQBXVbjfpxmd2l0LIJ+Py/FcAx6wRGR4p2beg=; 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=HcaqE481AFPHcvXjR+yLHXN1i7scMgp+G9cZnO/kbtyOw3qjSn1jEtRUcIPAtqTgZ hobpsQccy5eiPTxoj1uK/LKan4n5C2aHT8aoroe5TWNolyBuRidDZNvBYj8U6xDG6/ mRauR8zElf4ndk/p2xsylwXG8yNlE1sDoFgsFeJ4= Received: from lndn.lancelotsix.com (vps-42846194.vps.ovh.net [IPv6:2001:41d0:801:2000::2400]) by sourceware.org (Postfix) with ESMTPS id C74A73858D3C for ; Sun, 21 Nov 2021 17:57:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C74A73858D3C Received: from Plymouth.lan (unknown [IPv6:2a02:390:9086:0:e409:90b0:99cc:9f98]) by lndn.lancelotsix.com (Postfix) with ESMTPSA id BF5208198D; Sun, 21 Nov 2021 17:57:33 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 09/29] gdb/testsuite: Remove duplicates from gdb.base/solib-display.exp Date: Sun, 21 Nov 2021 17:56:16 +0000 Message-Id: <20211121175636.779325-10-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:57:35 +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/solib-display.exp ... DUPLICATE: gdb.base/solib-display.exp: NO: break 25 DUPLICATE: gdb.base/solib-display.exp: NO: continue DUPLICATE: gdb.base/solib-display.exp: IN: break 25 DUPLICATE: gdb.base/solib-display.exp: IN: continue DUPLICATE: gdb.base/solib-display.exp: SEP: break 25 DUPLICATE: gdb.base/solib-display.exp: SEP: continue The 'break 25' appears because the test inserts two breakpoints at the same location. Fix this by only inserting the breakpoint once. Fix the 'continue' DUPLICATE by giving a phony name to the second continue: 'continue two'. While at it, this commit also removes a trailing space. Tested on x86_64-linux. --- gdb/testsuite/gdb.base/solib-display.exp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.base/solib-display.exp index 54de334357f..f075b295899 100644 --- a/gdb/testsuite/gdb.base/solib-display.exp +++ b/gdb/testsuite/gdb.base/solib-display.exp @@ -140,7 +140,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" { # are not cleared permaturely. gdb_test "break [gdb_get_line_number "break here" ${testfile}.c]" \ - ".*Breakpoint.* at .*" + ".*Breakpoint.* at .*" gdb_test "continue" gdb_test "display main_global" "4: main_global = 44" @@ -153,11 +153,9 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" { } gdb_test "" "6: a_static = 46\\r\\n4: main_global = 44\\r\\n.*" - gdb_test "break [gdb_get_line_number "break here" ${testfile}.c]" \ - ".*Breakpoint.* at .*" gdb_test "continue" [multi_line \ "4: main_global = 44" \ "5: a_local = 45" \ "6: a_static = 46" \ - ] + ] "continue two" }} -- 2.33.1