From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id AO/PBPtnoWE6QAAAWB0awg (envelope-from ) for ; Fri, 26 Nov 2021 18:04:27 -0500 Received: by simark.ca (Postfix, from userid 112) id 1182C1F0CE; Fri, 26 Nov 2021 18:04:27 -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 8D3C81EDF0 for ; Fri, 26 Nov 2021 18:04:26 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 270B83857C60 for ; Fri, 26 Nov 2021 23:04:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 270B83857C60 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1637967866; bh=3bh3+UWrcKTDHeFBExjoItJozFtREWriux0GaiePhio=; 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=kk+b8zPlf+UFL4VH/orKcZMfl+1yWWqyX7mYSPXocgtdb+WDpHqU3ia4r1C/wy8Dt fq//t6KZnw9w7EsDZePk6zBd6i9KJxkBHeFlYQkRxRl0sYhGx/JpEeVHgrR13vfwOD Ll8StbTxdGc5+w/f4GymNOo9QDFkLQlEbxAGOK0s= Received: from lndn.lancelotsix.com (lndn.lancelotsix.com [51.195.220.111]) by sourceware.org (Postfix) with ESMTPS id D09D83857C59 for ; Fri, 26 Nov 2021 23:01:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D09D83857C59 Received: from Plymouth.lan (unknown [IPv6:2a02:390:9086:0:a47d:3441:84f3:f4bc]) by lndn.lancelotsix.com (Postfix) with ESMTPSA id B8EEF85743; Fri, 26 Nov 2021 23:00:59 +0000 (UTC) To: gdb-patches@sourceware.org Subject: [PATCH 08/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-nonstop-exit.exp Date: Fri, 26 Nov 2021 23:00:34 +0000 Message-Id: <20211126230038.103225-9-lsix@lancelotsix.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211126230038.103225-1-lsix@lancelotsix.com> References: <20211126230038.103225-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]); Fri, 26 Nov 2021 23:00:59 +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.mi/mi-nonstop-exit.exp ... DUPLICATE: gdb.mi/mi-nonstop-exit.exp: breakpoint at main DUPLICATE: gdb.mi/mi-nonstop-exit.exp: mi runto main This test runs the same sequence of operations twice. Refactor the code by running both of those sequences within a foreach_with_prefix block to ensure that the commands have unique test names. There is a slight modification of behaviour introduced by this patch. mi_delete_breakpoints is called one more time just before quitting gdb, which is in my opinion is worth given the simplification. Tested on x86_64-linux. --- gdb/testsuite/gdb.mi/mi-nonstop-exit.exp | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp index 99ac92f15a3..740856ca822 100644 --- a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp +++ b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp @@ -39,24 +39,16 @@ save_vars { GDBFLAGS } { mi_gdb_test "-gdb-set mi-async 1" ".*" mi_detect_async -if { [mi_runto_main] < 0 } { - continue -} - -mi_send_resuming_command "exec-continue" "continue" - -mi_expect_stop "exited-normally" "" "" "" "" "" "finished exec continue" +foreach_with_prefix iteration {1 2} { + if { [mi_runto_main] < 0 } { + continue + } -# Run the program again. + mi_send_resuming_command "exec-continue" "continue" -mi_delete_breakpoints + mi_expect_stop "exited-normally" "" "" "" "" "" "finished exec continue" -if { [mi_runto_main] < 0 } { - continue + mi_delete_breakpoints } -mi_send_resuming_command "exec-continue" "continue (2)" - -mi_expect_stop "exited-normally" "" "" "" "" "" "finished exec continue (2)" - mi_gdb_exit -- 2.33.1