From ebbed4c4c36813d4fb3af6f56b4fda6fd5794821 Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Mon, 7 Feb 1994 00:06:45 +0000 Subject: [PATCH] * config/udi-gdb.exp (gdb_load): Use "file", not "load" command, since "run" automatically loads if necessary. --- gdb/testsuite/ChangeLog | 3 +++ gdb/testsuite/config/udi-gdb.exp | 30 ++++-------------------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1b3c1cd1769..0fadcd4754c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,8 @@ Sun Feb 6 15:36:13 1994 Jim Kingdon (kingdon@lioth.cygnus.com) + * config/udi-gdb.exp (gdb_load): Use "file", not "load" command, + since "run" automatically loads if necessary. + * config/udi-gdb.exp (gdb_start): Don't send "set args main" to GDB. GDB doesn't work that way (not anymore at least) on UDI. * gdb.t01/run.exp: Don't pass extra first argument for UDI. diff --git a/gdb/testsuite/config/udi-gdb.exp b/gdb/testsuite/config/udi-gdb.exp index ae44aa80854..0a78b3117c1 100644 --- a/gdb/testsuite/config/udi-gdb.exp +++ b/gdb/testsuite/config/udi-gdb.exp @@ -42,39 +42,17 @@ proc gdb_version {} { } # -# gdb_load -- load a file into the GDB. -# Returns a 0 if there was an error, -# 1 if it load successfully. +# gdb_load -- load a file into the debugger. +# return a -1 if anything goes wrong. # proc gdb_load { arg } { global verbose global loadpath global loadfile - global prompt - global spawn_id global GDB - global expect_out + global prompt - send "load $arg\n" - verbose "Loading $arg into $GDB" - expect { - -re "Loading.*\.text.*\.data.*\.bss.*Reading symbols from $arg.+done.*$prompt $" { - verbose "Loaded $arg into $GDB" - return 1 - } - -re "$prompt $" { - error "Couldn't load $arg into $GDB." - return 0 - } - timeout { - error "Timed out trying to load $arg." - return 0 - } - } - if [info exists expect_out(buffer)] then { - send_log $expect_out(buffer) - } - return 0 + return [gdb_file_cmd $arg] } # -- 2.30.2