Tweaked to work with either version of expect. removed gdb_unload proc

cause it's already in lib/gdb.exp.

diff --git a/gdb/testsuite/config/unix-gdb.exp b/gdb/testsuite/config/unix-gdb.exp
index 58325f9cf8c093a8ff20040c4c0cff2550ee3bf6..1edda205831eec42f044065470d3d2a902dd5945 100644 (file)
--- a/gdb/testsuite/config/unix-gdb.exp
+++ b/gdb/testsuite/config/unix-gdb.exp
@@ -46,33 +46,6 @@ proc gdb_version {} {
 # gdb_unload -- unload a file if one is loaded
 #
 
-proc gdb_unload {} {
-    global verbose
-    global GDB
-    global prompt
-    send "file\n"
-    expect {
-       -re "No exec file now\.\r" { continue -expect }
-       -re "No symbol file now\.\r" { continue -expect }
-       -re "A program is being debugged already..*Kill it\? \(y or n\) $"\
-           { send "y\n"
-               if $verbose>1 then {
-                   send_user "\t\tKilling previous program being debugged\n"
-               }
-           continue -expect
-       }
-       -re "Discard symbol table from .*\? \(y or n\) $" {
-           send "y\n"
-           continue -expect
-       }
-       -re "$prompt $" {}
-       timeout {
-           perror "Couldn't unload file in $GDB (timed out)."
-           return -1
-       }
-    }
-}
-
 #
 # gdb_load -- load a file into the debugger.
 #             return a -1 if anything goes wrong.