From d1e47b8e0655df5d91d5e11405f40645243dacae Mon Sep 17 00:00:00 2001 From: Bob Manson Date: Tue, 4 Mar 1997 00:49:59 +0000 Subject: [PATCH] * gdb.base/a1-selftest.exp: Use send_gdb consistently. Don't refer to gdb_spawn_id. * config/m32r-stub.exp: Remove references to gdb_spawn_id, no longer used. * config/sparclet.exp: Ditto. * config/sparclet-old.exp: Ditto. * config/slite.exp: Ditto. * config/sim.exp: Ditto. * gdb.base/funcargs.exp: Ditto. * lib/gdb.exp:Remove references to gdb_spawn_id. (gdb_expect): Move to remote.exp. --- gdb/testsuite/ChangeLog | 16 ++++++++++++++++ gdb/testsuite/config/sparclet-old.exp | 2 -- gdb/testsuite/config/sparclet.exp | 4 ---- gdb/testsuite/gdb.base/a1-selftest.exp | 21 ++++++++++----------- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7fb7986553f..55698d41cef 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,19 @@ +Mon Mar 3 11:57:43 1997 Bob Manson + + * gdb.base/a1-selftest.exp: Use send_gdb consistently. Don't + refer to gdb_spawn_id. + + * config/m32r-stub.exp: Remove references to gdb_spawn_id, no + longer used. + * config/sparclet.exp: Ditto. + * config/sparclet-old.exp: Ditto. + * config/slite.exp: Ditto. + * config/sim.exp: Ditto. + * gdb.base/funcargs.exp: Ditto. + + * lib/gdb.exp:Remove references to gdb_spawn_id. + (gdb_expect): Move to remote.exp. + Fri Feb 28 20:47:39 1997 Bob Manson * config/monitor.exp: Detect the "Couldn't establish connection" diff --git a/gdb/testsuite/config/sparclet-old.exp b/gdb/testsuite/config/sparclet-old.exp index 0b4e4e8279e..9d0f1ae00cc 100644 --- a/gdb/testsuite/config/sparclet-old.exp +++ b/gdb/testsuite/config/sparclet-old.exp @@ -38,7 +38,6 @@ set gdb_prompt "\\(gdbslet\\)" proc gdb_run_cmd {} { global gdb_prompt - global gdb_spawn_id set timeout 60 verbose "Timeout is now $timeout seconds, starting remote stub" 2 @@ -193,7 +192,6 @@ proc gdb_load { arg } { global gdb_prompt global GDB global expect_out - global gdb_spawn_id set loadfile [file tail $arg] set loadpath [file dirname $arg] diff --git a/gdb/testsuite/config/sparclet.exp b/gdb/testsuite/config/sparclet.exp index 6c7832e3e91..4dd193c9243 100644 --- a/gdb/testsuite/config/sparclet.exp +++ b/gdb/testsuite/config/sparclet.exp @@ -37,7 +37,6 @@ set gdb_prompt "\\(gdbslet\\)" # proc gdb_start { } { - global gdb_spawn_id; global gdb_prompt global GDB @@ -66,7 +65,6 @@ proc gdb_start { } { } proc gdb_sparclet_startup { } { - global gdb_spawn_id; global gdb_prompt global GDB @@ -212,7 +210,6 @@ proc gdb_sparclet_startup { } { } proc gdb_run_cmd { args } { - global gdb_spawn_id global gdb_prompt gdb_breakpoint exit; @@ -246,7 +243,6 @@ proc gdb_load { arg } { global gdb_prompt global GDB global expect_out - global gdb_spawn_id set loadfile [file tail $arg] set loadpath [file dirname $arg] diff --git a/gdb/testsuite/gdb.base/a1-selftest.exp b/gdb/testsuite/gdb.base/a1-selftest.exp index c7f395d154f..eac8b02764d 100644 --- a/gdb/testsuite/gdb.base/a1-selftest.exp +++ b/gdb/testsuite/gdb.base/a1-selftest.exp @@ -52,7 +52,7 @@ proc do_steps_and_nexts {} { gdb_reinitialize_dir $srcdir/.. for {set count 0} {$count < 20} {incr count} { - send "list\n" + send_gdb "list\n" gdb_expect { -re ".*symarg = NULL.*$gdb_prompt $" { set description "step over symarg initialization" @@ -143,7 +143,7 @@ proc do_steps_and_nexts {} { return } } - send "$command\n" + send_gdb "$command\n" gdb_expect { -re ".*No such file or directory.\r\n$gdb_prompt $" { fail "$description (no source available)" @@ -167,7 +167,6 @@ proc test_with_self { executable } { global det_file global decimal global timeout - global gdb_spawn_id # load yourself into the debugger # This can take a relatively long time, particularly for testing where @@ -220,7 +219,7 @@ proc test_with_self { executable } { set timeout 600 set description "run until breakpoint at main" - send "run -nw\n" + send_gdb "run -nw\n" gdb_expect { -re "Starting program.*Breakpoint \[0-9\]+,.*main .argc.*argv.* at .*main.c:.*$gdb_prompt $" { pass "$description" @@ -249,7 +248,7 @@ proc test_with_self { executable } { verbose "Timeout is now $timeout seconds" 2 # do we have a version number ? - send "print version\n" + send_gdb "print version\n" gdb_expect { -re ".\[0-9\]+ = +0x.*\[0-9.\]+.*$gdb_prompt $" { pass "printed version" @@ -272,7 +271,7 @@ proc test_with_self { executable } { # on most RISC processors. setup_xfail "alpha-*-*" "hppa*-*-*" "mips-*-*" set description "step into xmalloc call" - send "step\n" + send_gdb "step\n" gdb_expect { -re "xmalloc.*size=.*at.*utils.c.*$gdb_prompt $" { pass "$description" @@ -292,7 +291,7 @@ proc test_with_self { executable } { } # start the "xgdb" process - send "continue\n" + send_gdb "continue\n" gdb_expect { -re "GNU gdb \[0-9\.\]*.* Copyright \[0-9\]* Free Software Foundation, Inc.* @@ -312,7 +311,7 @@ GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$gdb_prompt $"\ } # set xgdb prompt so we can tell which is which - send "set prompt (xgdb) \n" + send_gdb "set prompt (xgdb) \n" gdb_expect { -re "\[(\]xgdb\[)\].*\[(\]xgdb\[)\] $" { pass "Set xgdb prompt" } -re ".*$gdb_prompt $" { fail "Set xgdb prompt" } @@ -321,7 +320,7 @@ GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$gdb_prompt $"\ # kill the xgdb process set description "send ^C to child process" - send "\003" + send_gdb "\003" gdb_expect { -re "Program received signal SIGINT.*$gdb_prompt $" { pass "$description" @@ -335,7 +334,7 @@ GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$gdb_prompt $"\ } set description "send SIGINT signal to child process" - send "signal SIGINT\n" + send_gdb "signal SIGINT\n" gdb_expect { -re "Continuing with signal SIGINT.*$gdb_prompt $" { pass "$description" @@ -355,7 +354,7 @@ GDB.*Copyright \[0-9\]+ Free Software Foundation, Inc..*$gdb_prompt $"\ # The testsuite failures may not be limited to just aout systems. setup_xfail "i*86-pc-linuxaout-gnu" "hppa*-*-hpux*" set description "backtrace through signal handler" - send "backtrace\n" + send_gdb "backtrace\n" gdb_expect { -re "#0.*read.*in main \\(.*\\) at .*main\\.c.*$gdb_prompt $" { pass "$description" -- 2.30.2