[4/8] gdb/testsuite: extend the use of mi_clean_restart
Commit Message
The mi_clean_restart proc calls the mi_gdb_start proc passing no
arguments.
In this commit I add an extra (optional) argument to the
mi_clean_restart proc, and pass this through to mi_gdb_start.
The benefit of this is that we can now use mi_clean_restart when we
also want to pass the 'separate-mi-tty' or 'separate-inferior-tty'
flags to mi_gdb_start, and avoids having to otherwise duplicate the
contents of mi_clean_restart in different tests.
I've updated the obvious places where this new functionality can be
used, and I'm seeing no test regressions.
---
gdb/testsuite/gdb.mi/mi-break.exp | 8 +-------
gdb/testsuite/gdb.mi/mi-exec-run.exp | 1 -
gdb/testsuite/gdb.mi/mi-multi-commands.exp | 3 +--
gdb/testsuite/gdb.mi/mi-watch.exp | 8 +-------
gdb/testsuite/gdb.mi/new-ui-mi-sync.exp | 8 +-------
gdb/testsuite/gdb.mi/user-selected-context-sync.exp | 8 +-------
gdb/testsuite/lib/mi-support.exp | 4 ++--
7 files changed, 7 insertions(+), 33 deletions(-)
@@ -393,21 +393,15 @@ proc_with_prefix test_forced_conditions {} {
proc test_break {mi_mode} {
global srcdir subdir binfile
- mi_gdb_exit
-
if {$mi_mode == "separate"} {
set start_ops "separate-mi-tty"
} else {
set start_ops ""
}
- if [mi_gdb_start $start_ops] {
+ if [mi_clean_restart $binfile $start_ops ] {
return
}
- mi_delete_breakpoints
- mi_gdb_reinitialize_dir $srcdir/$subdir
- mi_gdb_load ${binfile}
-
test_tbreak_creation_and_listing
test_ignore_count
@@ -73,7 +73,6 @@ proc test {inftty_mode mi_mode force_fail} {
mi_delete_breakpoints
mi_gdb_reinitialize_dir $srcdir/$subdir
- mi_gdb_reinitialize_dir $srcdir/$subdir
mi_gdb_load ${bin}
# Useful for debugging:
@@ -38,8 +38,7 @@ proc run_test { args } {
global mi_gdb_prompt
global decimal
- gdb_exit
- if [mi_gdb_start $args] {
+ if [mi_clean_restart "" $args] {
return
}
@@ -150,14 +150,12 @@ proc test_watchpoint_all {mi_mode type} {
return
}
- mi_gdb_exit
-
if {$mi_mode == "separate"} {
set start_ops "separate-mi-tty"
} else {
set start_ops ""
}
- if [mi_gdb_start $start_ops] {
+ if [mi_clean_restart ${binfile} $start_ops] {
return
}
@@ -170,10 +168,6 @@ proc test_watchpoint_all {mi_mode type} {
"567\\^done" \
"hw watchpoints toggle"
- mi_delete_breakpoints
- mi_gdb_reinitialize_dir $srcdir/$subdir
- mi_gdb_load ${binfile}
-
mi_runto callee4
test_watchpoint_creation_and_listing
#test_rwatch_creation_and_listing
@@ -40,17 +40,11 @@ proc do_test {sync_command} {
global gdb_spawn_id gdb_main_spawn_id mi_spawn_id inferior_spawn_id
global gdb_prompt mi_gdb_prompt
- mi_gdb_exit
-
- if {[mi_gdb_start "separate-mi-tty"] != 0} {
+ if {[mi_clean_restart $binfile "separate-mi-tty"] != 0} {
fail "could not start gdb"
return
}
- mi_delete_breakpoints
- mi_gdb_reinitialize_dir $srcdir/$subdir
- mi_gdb_load $binfile
-
# Start a synchronous run/continue on the MI UI.
set test "send synchronous execution command"
if {$sync_command == "run"} {
@@ -396,22 +396,16 @@ proc_with_prefix test_setup { mode } {
set any "\[^\r\n\]*"
- mi_gdb_exit
-
save_vars { GDBFLAGS } {
if { $mode == "non-stop" } {
set GDBFLAGS [concat $GDBFLAGS " -ex \"set non-stop 1\""]
}
- if { [mi_gdb_start "separate-mi-tty"] != 0 } {
+ if { [mi_clean_restart $binfile "separate-mi-tty"] != 0 } {
return -1
}
}
- mi_delete_breakpoints
- mi_gdb_reinitialize_dir $srcdir/$subdir
- mi_gdb_load $binfile
-
if { [mi_runto_main] < 0 } {
return -1
}
@@ -1012,7 +1012,7 @@ proc mi_run_with_cli {args} {
# EXECUTABLE is the basename of the binary.
# Return -1 if starting gdb or loading the executable failed.
-proc mi_clean_restart {{executable ""}} {
+proc mi_clean_restart {{executable ""} {flags {}}} {
global srcdir
global subdir
global errcnt
@@ -1024,7 +1024,7 @@ proc mi_clean_restart {{executable ""}} {
set errcnt 0
set warncnt 0
- if {[mi_gdb_start]} {
+ if {[mi_gdb_start $flags]} {
return -1
}