* lib/gdb.exp: Transform tool name.

	* gdb.t*/*.exp: Change error to perror so it works with DejaGnu
	1.1's new error handling system.

1 files changed, 6 insertions, 21 deletions

diff --git a/gdb/testsuite/config/unix-gdb.exp b/gdb/testsuite/config/unix-gdb.exp
index db33418..32e4a9c 100644
--- a/gdb/testsuite/config/unix-gdb.exp
+++ b/gdb/testsuite/config/unix-gdb.exp
@@ -67,7 +67,7 @@ proc gdb_unload {} {
 	}
 	-re "$prompt $" {}
 	timeout {
-	    error "Couldn't unload file in $GDB (timed out)."
+	    perror "Couldn't unload file in $GDB (timed out)."
 	    return -1
 	}
     }
@@ -108,14 +108,14 @@ proc gdb_start {} {
 	if {[which $GDB] != 0} then {
 	    spawn $GDB $GDBFLAGS
 	} else {
-	    error "$GDB does not exist."
+	    perror "$GDB does not exist."
 	    exit 1
 	}
     } else {
 	if {[which $GDB] != 0} then {
 	    spawn $GDB
 	} else {
-	    error "$GDB does not exist."
+	    perror "$GDB does not exist."
 	    exit 1
 	}
     }
@@ -126,11 +126,11 @@ proc gdb_start {} {
 	    }
 	}
 	-re "$prompt $"	{
-	    error "GDB never initialized."
+	    perror "GDB never initialized."
 	    return -1
 	}
 	timeout		{
-	    error "(timeout) GDB never initialized."
+	    perror "(timeout) GDB never initialized."
 	    return -1
 	}
     }
@@ -139,9 +139,7 @@ proc gdb_start {} {
     send "set height 0\n"
     expect {
 	-re ".*$prompt $" { 
-	    if $verbose>2 then {
-		send_user "Seting height to 0.\n"
-	    }
+	    verbose "Seting height to 0."
 	}
 	timeout {
 	    warning "Couldn't set the height to 0."
@@ -165,19 +163,6 @@ proc gdb_exit { } {
     catch default_gdb_exit
 }
 
-# These only need to be uncommented for debugging test cases. They exist
-# mainly to catch programming errors
-#expect_after {
-#    "<return>"		   { send "\n"; error "Window too small." }
-#    -re "\(y or n\) " 	   { send "n\n"; error "Got interactive prompt." }
-#    buffer_full		   { error "internal buffer is full." }
-#    eof			   { error "eof -- there is no child process" ; cleanup ; exit $exit_status}
-#    timeout			   { error "timeout." }
-#    "virtual memory exhausted" { error "virtual memory exhausted." }
-#    "Undefined command"	   { error "send string probably wrong." }
-#}
-
-
 set binpath /s1/users/rob/vxworks/bin/somewhere-bogus-that-needs-configuring
 set bin $GDB