mirror of
https://github.com/espressif/binutils-gdb.git
synced 2025-06-23 03:29:47 +08:00
lib/gdb.exp(gdb_expect): Handle getting a value for $timeout
more gracefully.
This commit is contained in:
@ -1,7 +1,8 @@
|
||||
Tue Jun 17 13:10:10 1997 Bob Manson <manson@charmed.cygnus.com>
|
||||
|
||||
* lib/gdb.exp(gdb_expect): Declare errorInfo and errorCode
|
||||
as global variables.
|
||||
* lib/gdb.exp(gdb_expect): Declare errorInfo and errorCode as
|
||||
global variables. Handle getting a value for $timeout more
|
||||
gracefully.
|
||||
|
||||
Sat Jun 14 09:23:26 1997 Bob Manson <manson@charmed.cygnus.com>
|
||||
|
||||
|
@ -859,22 +859,25 @@ proc gdb_expect { args } {
|
||||
upvar timeout timeout
|
||||
if [target_info exists gdb,timeout] {
|
||||
if [info exists timeout] {
|
||||
set oldt $timeout;
|
||||
if { $timeout < [target_info gdb,timeout] } {
|
||||
set timeout [target_info gdb,timeout];
|
||||
set gtimeout [target_info gdb,timeout];
|
||||
} else {
|
||||
set gtimeout $timeout;
|
||||
}
|
||||
} else {
|
||||
set timeout [target_info gdb,timeout];
|
||||
set gtimeout [target_info gdb,timeout];
|
||||
}
|
||||
}
|
||||
set code [catch {uplevel remote_expect host $timeout $args} string];
|
||||
if [target_info exists gdb,timeout] {
|
||||
if [info exists oldt] {
|
||||
set timeout $oldt
|
||||
if ![info exists gtimeout] {
|
||||
global timeout;
|
||||
if [info exists timeout] {
|
||||
set gtimeout $timeout;
|
||||
} else {
|
||||
unset timeout
|
||||
# Eeeeew.
|
||||
set gtimeout 60;
|
||||
}
|
||||
}
|
||||
set code [catch {uplevel remote_expect host $gtimeout $args} string];
|
||||
|
||||
if {$code == 1} {
|
||||
global errorInfo errorCode;
|
||||
|
Reference in New Issue
Block a user