From patchwork Wed Nov 23 18:39:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 61038 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6D0E338518AD for ; Wed, 23 Nov 2022 18:49:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6D0E338518AD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669229359; bh=sx66g4/pr4cIRmSohidjMT3bhEWgJqxx3x8T7LD8+/A=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=RHKDb0fAp8PzEUl0VDQw1o18hRLvKTSNcC9QeQcj5n32UTenQ9bLixmrDjO4I1wln AaqHkXr6y4Ti2TIEgqUBGzVAM2MhoX/FIMoC9sQza5mvZrAM8KA07QK0rrJeco7NQ7 sYd6e3G6Yx517efaJx3ZMfZpgyKaquaJN+dpmIkA= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp.polymtl.ca (smtp.polymtl.ca [132.207.4.11]) by sourceware.org (Postfix) with ESMTPS id 52FBB38518AB for ; Wed, 23 Nov 2022 18:48:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 52FBB38518AB Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id 2ANImpMJ001022 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 23 Nov 2022 13:48:56 -0500 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca 2ANImpMJ001022 Received: from simark.localdomain (unknown [217.28.27.60]) (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 ESMTPSA id 3CF811E12A; Wed, 23 Nov 2022 13:40:04 -0500 (EST) To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [PATCH 06/14] gdb/testsuite/gdb.base/break.exp: split test_finish_arguments Date: Wed, 23 Nov 2022 13:39:51 -0500 Message-Id: <20221123183959.2476477-7-simon.marchi@polymtl.ca> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221123183959.2476477-1-simon.marchi@polymtl.ca> References: <20221123183959.2476477-1-simon.marchi@polymtl.ca> MIME-Version: 1.0 X-Poly-FromMTA: (simark.ca [158.69.221.121]) at Wed, 23 Nov 2022 18:48:51 +0000 X-Spam-Status: No, score=-3189.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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: , X-Patchwork-Original-From: Simon Marchi via Gdb-patches From: Simon Marchi Reply-To: Simon Marchi Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Change-Id: Id84babed1eeb3ce7d14b94ff332795964e8ead51 --- gdb/testsuite/gdb.base/break.exp | 50 ++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/gdb/testsuite/gdb.base/break.exp b/gdb/testsuite/gdb.base/break.exp index a888de8e2715..1f6c620ee0cb 100644 --- a/gdb/testsuite/gdb.base/break.exp +++ b/gdb/testsuite/gdb.base/break.exp @@ -656,35 +656,41 @@ gdb_test_multiple "finish" "finish from called function" { # Verify that GDB responds gracefully to a "finish" command with # arguments. -# -if ![runto_main] then { - return -} -send_gdb "finish 123\n" -gdb_expect { - -re "The \"finish\" command does not take any arguments.\r\n$gdb_prompt $"\ - {pass "finish with arguments disallowed"} - -re "$gdb_prompt $"\ - {fail "finish with arguments disallowed"} - timeout {fail "(timeout) finish with arguments disallowed"} -} +proc_with_prefix test_finish_arguments {} { + clean_restart break -# Verify that GDB responds gracefully to a request to "finish" from -# the outermost frame. On a stub that never exits, this will just -# run to the stubs routine, so we don't get this error... Thus the -# second condition. -# + if ![runto_main] then { + return + } -gdb_test_multiple "finish" "finish from outermost frame disallowed" { - -re "\"finish\" not meaningful in the outermost frame.\r\n$gdb_prompt $" { - pass "finish from outermost frame disallowed" + send_gdb "finish 123\n" + gdb_expect { + -re "The \"finish\" command does not take any arguments.\r\n$::gdb_prompt $"\ + {pass "finish with arguments disallowed"} + -re "$::gdb_prompt $"\ + {fail "finish with arguments disallowed"} + timeout {fail "(timeout) finish with arguments disallowed"} } - -re "Run till exit from.*\r\n$gdb_prompt $" { - pass "finish from outermost frame disallowed" + + # Verify that GDB responds gracefully to a request to "finish" from + # the outermost frame. On a stub that never exits, this will just + # run to the stubs routine, so we don't get this error... Thus the + # second condition. + # + + gdb_test_multiple "finish" "finish from outermost frame disallowed" { + -re "\"finish\" not meaningful in the outermost frame.\r\n$::gdb_prompt $" { + pass "finish from outermost frame disallowed" + } + -re "Run till exit from.*\r\n$::gdb_prompt $" { + pass "finish from outermost frame disallowed" + } } } +test_finish_arguments + #********