2001-05-03 Michael Snyder <msnyder@redhat.com>

* config/sid.exp (gdb_target_sid): Check for error messages.
	On error or timeout, don't make expect exit (which will terminate
	all subsequent tests); instead just make gdb exit.
	(gdb_load): Check for error messages.  On error or timeout,
	return a negative value.
This commit is contained in:
Michael Snyder 2001-05-04 21:07:01 +00:00
parent ca3f91ed68
commit 66c756c665
2 changed files with 26 additions and 4 deletions

View File

@ -1,3 +1,11 @@
2001-05-03 Michael Snyder <msnyder@redhat.com>
* config/sid.exp (gdb_target_sid): Check for error messages.
On error or timeout, don't make expect exit (which will terminate
all subsequent tests); instead just make gdb exit.
(gdb_load): Check for error messages. On error or timeout,
return a negative value.
2001-04-24 Jim Blandy <jimb@redhat.com>
* gdb.c++/templates.exp: If we see the prompt for the overload

View File

@ -141,13 +141,18 @@ proc gdb_target_sid { } {
set timeout 60
verbose "Timeout is now $timeout seconds" 2
gdb_expect {
-re ".*\[Ee\]rror.*$gdb_prompt $" {
perror "Couldn't set target for remote simulator."
cleanup
gdb_exit
}
-re "Remote debugging using.*$gdb_prompt" {
verbose "Set target to sid"
}
timeout {
perror "Couldn't set target for remote simulator."
cleanup
exit $exit_status
gdb_exit
}
}
set timeout $prev_timeout
@ -164,6 +169,7 @@ proc gdb_load { arg } {
global loadfile
global GDB
global gdb_prompt
global retval
gdb_unload
if [gdb_file_cmd $arg] then { return -1 }
@ -175,24 +181,32 @@ proc gdb_load { arg } {
set timeout 2400
verbose "Timeout is now $timeout seconds" 2
gdb_expect {
-re ".*\[Ee\]rror.*$gdb_prompt $" {
if $verbose>1 then {
perror "Error during download."
}
set retval -1;
}
-re ".*$gdb_prompt $" {
if $verbose>1 then {
send_user "Loaded $arg into $GDB\n"
}
set timeout 30
verbose "Timeout is now $timeout seconds" 2
return 1
set retval 1;
}
-re "$gdb_prompt $" {
if $verbose>1 then {
perror "GDB couldn't load."
}
set retval -1;
}
timeout {
if $verbose>1 then {
perror "Timed out trying to load $arg."
}
set retval -1;
}
}
set timeout $prev_timeout
verbose "Timeout is now $timeout seconds" 2
return $retval;
}