From patchwork Wed Jan 25 22:45:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 63698 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 B7CC838582B0 for ; Wed, 25 Jan 2023 22:46:48 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy1-pub.mail.unifiedlayer.com (gproxy1-pub.mail.unifiedlayer.com [69.89.25.95]) by sourceware.org (Postfix) with ESMTPS id A033E3858D38 for ; Wed, 25 Jan 2023 22:46:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A033E3858D38 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw12.mail.unifiedlayer.com (unknown [10.0.90.127]) by progateway3.mail.pro1.eigbox.com (Postfix) with ESMTP id EE1B710048568 for ; Wed, 25 Jan 2023 22:46:25 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id KoXBpXCmXgsICKoXBpZDbN; Wed, 25 Jan 2023 22:46:25 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=H7Ief8Ui c=1 sm=1 tr=0 ts=63d1b141 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=RvmDmJFTN0MA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=mXmDpjk9pV4TlI7zl2wA:9 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=LqQ/cXfd35DH/ggoDe0sCRSGcaq1RmMeos7tV1gjKmc=; b=Lazfwbc11gUGyfKXQHCU0va+XP HYrIsdgyDIVuZfvLcFHFQlSbMMRbguPzi7TGz8aTyz0n590iE53a5kxQNjkQUnR86c7Tq+H0VlXPQ x3lvdXzvT31Cu0rkwTgPkdNlo; Received: from 97-122-76-186.hlrn.qwest.net ([97.122.76.186]:44138 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pKoXB-000gXg-Ee; Wed, 25 Jan 2023 15:46:25 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 01/27] Use ordinary calling convention for clean_restart Date: Wed, 25 Jan 2023 15:45:48 -0700 Message-Id: <20230125224614.1006886-2-tom@tromey.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230125224614.1006886-1-tom@tromey.com> References: <20230125224614.1006886-1-tom@tromey.com> MIME-Version: 1.0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.76.186 X-Source-L: No X-Exim-ID: 1pKoXB-000gXg-Ee X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-76-186.hlrn.qwest.net (localhost.localdomain) [97.122.76.186]:44138 X-Source-Auth: tom+tromey.com X-Email-Count: 11 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" clean_restart accepts a single optional argument. Rather than using {args} and handling the argument by hand, change it to use Tcl's own argument-checking. --- gdb/testsuite/lib/gdb.exp | 11 +++-------- gdb/testsuite/lib/mi-support.exp | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index e2af5a252b7..7c539ce15e6 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -7432,20 +7432,16 @@ proc build_executable { testname executable {sources ""} {options {debug}} } { } # Starts fresh GDB binary and loads an optional executable into GDB. -# Usage: clean_restart [executable] +# Usage: clean_restart [EXECUTABLE] # EXECUTABLE is the basename of the binary. # Return -1 if starting gdb or loading the executable failed. -proc clean_restart { args } { +proc clean_restart {{executable ""}} { global srcdir global subdir global errcnt global warncnt - if { [llength $args] > 1 } { - error "bad number of args: [llength $args]" - } - gdb_exit # This is a clean restart, so reset error and warning count. @@ -7465,8 +7461,7 @@ proc clean_restart { args } { gdb_reinitialize_dir $srcdir/$subdir - if { [llength $args] >= 1 } { - set executable [lindex $args 0] + if {$executable != ""} { set binfile [standard_output_file ${executable}] return [gdb_load ${binfile}] } diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index b6da2c4baf0..767ea72ff70 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -1008,20 +1008,16 @@ proc mi_run_with_cli {args} { } # Starts fresh GDB binary and loads an optional executable into GDB. -# Usage: mi_clean_restart [executable] +# Usage: mi_clean_restart [EXECUTABLE] # EXECUTABLE is the basename of the binary. # Return -1 if starting gdb or loading the executable failed. -proc mi_clean_restart { args } { +proc mi_clean_restart {{executable ""}} { global srcdir global subdir global errcnt global warncnt - if { [llength $args] > 1 } { - error "bad number of args: [llength $args]" - } - gdb_exit # This is a clean restart, so reset error and warning count. @@ -1034,8 +1030,7 @@ proc mi_clean_restart { args } { mi_gdb_reinitialize_dir $srcdir/$subdir - if { [llength $args] >= 1 } { - set executable [lindex $args 0] + if {$executable != ""} { set binfile [standard_output_file ${executable}] return [mi_gdb_load ${binfile}] }