From: Doug Evans Date: Fri, 24 Jul 2015 22:35:12 +0000 (-0700) Subject: lib/gdb.exp (clean_restart): Make executable optional. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b606f95c9bcfa1b569fe5d33f7d2a73d39322f4;p=binutils-gdb.git lib/gdb.exp (clean_restart): Make executable optional. gdb/testsuite/ChangeLog: * lib/gdb.exp (clean_restart): Make executable optional. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 992d74a72f3..6c7b9298df4 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2015-07-24 Doug Evans + + * lib/gdb.exp (clean_restart): Make executable optional. + 2015-07-24 Doug Evans * gdb.base/watchpoint.exp (test_complex_watchpoint): Remove diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index f32d04a3f21..1f3f838a9ad 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -4895,18 +4895,27 @@ proc build_executable { testname executable {sources ""} {options {debug}} } { return [eval build_executable_from_specs $arglist] } -# Starts fresh GDB binary and loads EXECUTABLE into GDB. EXECUTABLE is -# the basename of the binary. -# The return value is 0 for success, -1 for failure. -proc clean_restart { executable } { +# Starts fresh GDB binary and loads an optional executable into GDB. +# Usage: clean_restart [executable] +# EXECUTABLE is the basename of the binary. + +proc clean_restart { args } { global srcdir global subdir - set binfile [standard_output_file ${executable}] + + if { [llength $args] > 1 } { + error "bad number of args: [llength $args]" + } gdb_exit gdb_start gdb_reinitialize_dir $srcdir/$subdir - return [gdb_load ${binfile}] + + if { [llength $args] >= 1 } { + set executable [lindex $args 0] + set binfile [standard_output_file ${executable}] + gdb_load ${binfile} + } } # Prepares for testing by calling build_executable_full, then