diff mbox series

[01/27] Use ordinary calling convention for clean_restart

Message ID	20230125224614.1006886-2-tom@tromey.com
State	Committed
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A033E3858D38 From: Tom Tromey <tom@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> 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> In-Reply-To: <20230125224614.1006886-1-tom@tromey.com> References: <20230125224614.1006886-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	Many small testsuite cleanups \| [00/27] Many small testsuite cleanups [01/27] Use ordinary calling convention for clean_restart [02/27] Use clean_restart in gdb.dlang [03/27] Eliminate spurious returns from the test suite [04/27] Remove some dead code in gdb.fortran/info-types.exp [05/27] Minor "require" fixups [06/27] Remove unnecessary call to standard_testfile [07/27] Start gdb after building executable in mi-basics.exp [08/27] Use mi_clean_restart more [09/27] Use clean_restart in gdb.pascal [10/27] Use clean_restart in gdb.linespec [11/27] Use clean_restart in gdb.opencl [12/27] Use clean_restart in gdb.trace [13/27] Use clean_restart in gdb.objc [14/27] Use clean_restart in gdb.threads [15/27] Use clean_restart in gdb.guile [16/27] Use clean_restart in gdb.arch [17/27] Use clean_restart in gdb.reverse [18/27] Use clean_restart in gdb.dwarf2 [19/27] Use clean_restart in gdb.ada [20/27] Use clean_restart in gdb.fortran [21/27] Use clean_restart in gdb.stabs [22/27] Use clean_restart in gdb.go [23/27] Use clean_restart in gdb.perf [24/27] Use clean_restart in gdb.disasm [25/27] Use clean_restart in gdb.cp [26/27] Use clean_restart in gdb.python [27/27] Use clean_restart in gdb.base

Commit Message

Tom Tromey Jan. 25, 2023, 10:45 p.m. UTC

  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 mbox series

Patch

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}]
     }