From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id eN/ZHjaJmmEyUQAAWB0awg (envelope-from ) for ; Sun, 21 Nov 2021 13:00:22 -0500 Received: by simark.ca (Postfix, from userid 112) id 7CCEB1F0CE; Sun, 21 Nov 2021 13:00:22 -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 B37081EDF0 for ; Sun, 21 Nov 2021 13:00:21 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 414F73858415 for ; Sun, 21 Nov 2021 18:00:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 414F73858415 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637517621; bh=rpv6oXueNQf6lcH/FPw7OgmbdCJOLNvX9y1oMvnq/9s=; 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=BSPQ2YnjgDTBkGwX1CUdl6poMpIKlwlco3oIwfwcqqTswVvX48aXnbiad/opqjVZB 1dUTNNVkjQixkL+YHmaE3rXDllJJqN+GWRIKTrnVUWxQJKmt6UwsqS4XMAulsxnwIA 3yZ4BMikBENYIEvpkY9Jo+m5YNfV9EKwwB5+xhL8= Received: from lndn.lancelotsix.com (vps-42846194.vps.ovh.net [IPv6:2001:41d0:801:2000::2400]) by sourceware.org (Postfix) with ESMTPS id 5F6513858001 for ; Sun, 21 Nov 2021 17:57:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5F6513858001 Received: from Plymouth.lan (unknown [IPv6:2a02:390:9086:0:e409:90b0:99cc:9f98]) by lndn.lancelotsix.com (Postfix) with ESMTPSA id 7F9FC854F8; Sun, 21 Nov 2021 17:57:28 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 06/29] gdb/testsuite: Remove duplicates from gdb.base/checkpoint.exp Date: Sun, 21 Nov 2021 17:56:13 +0000 Message-Id: <20211121175636.779325-7-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-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:29 +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/checkpoint.exp ... DUPLICATE: gdb.base/checkpoint.exp: verify lines 5 two DUPLICATE: gdb.base/checkpoint.exp: restart 0 one This patch fixes the various erroneous incorrect test names. While at it, this patch also remove some trailing white spaces across the file. Tested on x86_64-linux. --- gdb/testsuite/gdb.base/checkpoint.exp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/gdb.base/checkpoint.exp b/gdb/testsuite/gdb.base/checkpoint.exp index 46042a9f345..6a1ec22aee3 100644 --- a/gdb/testsuite/gdb.base/checkpoint.exp +++ b/gdb/testsuite/gdb.base/checkpoint.exp @@ -65,7 +65,7 @@ gdb_test "checkpoint" ".*" "" gdb_test "continue 10" "breakpoint 1.*" "break1 three" gdb_test "checkpoint" ".*" "" -gdb_test "continue 10" "breakpoint 1.*" "break1 four" +gdb_test "continue 10" "breakpoint 1.*" "break1 four" gdb_test "checkpoint" ".*" "" gdb_test "continue 10" "breakpoint 1.*" "break1 five" @@ -146,7 +146,7 @@ gdb_test "print i + 1 == lines * 79" " = 1" "verify i 10 one" gdb_test "print lines" " = 91.*" "verify lines 10 one" # -# Now let the files be closed by the original process, +# Now let the files be closed by the original process, # and diff them. gdb_test "restart 0" "Switching to .*breakpoint 2.*" "restart 0 one" @@ -158,7 +158,7 @@ gdb_test "shell diff -s $pi_txt $copy1_txt" \ "diff input and output one" # -# And now run from various checkpoints, allowing +# And now run from various checkpoints, allowing # various amounts of input and output. # @@ -198,7 +198,7 @@ gdb_test "restart 6" "Switching to .*c == EOF.*" "restart 6 two" gdb_test "continue" ".*" "" gdb_test "continue 1000" "breakpoint 1.*" "breakpoint 1 6 one" gdb_test "step" "if .c == EOF.*" "step in 6 two" -gdb_test "print lines" " = 1052.*" "verify lines 5 two" +gdb_test "print lines" " = 1052.*" "verify lines 6 two" gdb_test "restart 7" "Switching to .*c == EOF.*" "restart 7 two" gdb_test "continue" ".*" "" @@ -210,12 +210,12 @@ gdb_test "shell diff -s $pi_txt $copy1_txt" \ "Files .*pi.txt and .*copy1.txt are identical.*" \ "diff input and output two" -# -# OK, now allow the original program to delete the output file, +# +# OK, now allow the original program to delete the output file, # and verify that the checkpoints can still write to it. -# +# -gdb_test "restart 0" "Switching to .*breakpoint 3.*" "restart 0 one" +gdb_test "restart 0" "Switching to .*breakpoint 3.*" "restart 0 two" gdb_breakpoint $break4_loc gdb_test "continue" "breakpoint 4.*" "break4 one" @@ -259,7 +259,7 @@ gdb_test "continue" \ # # There should be still at least five forks left -# +# gdb_test "info checkpoints" " 1 .* 2 .* 3 .* 4 .* 5 .*" \ "info checkpoints two" @@ -271,7 +271,7 @@ gdb_test "info checkpoints" " 1 .* 2 .* 3 .* 4 .* 5 .*" \ gdb_test "kill" "" "kill all one" \ "Kill the program being debugged.*y or n. $" "y" -# +# # and confirm that all are gone # @@ -324,7 +324,7 @@ gdb_test_multiple "info checkpoints" $msg { fail $msg } } -} +} # # OK, kill 'em all... -- 2.33.1