diff options
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 4a55850..0a44f6d 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -857,14 +857,18 @@ proc gdb_expect { args } { upvar timeout timeout if [target_info exists gdb,timeout] { if [info exists timeout] { - set oldt $timeout + set oldt $timeout; + if { $timeout < [target_info gdb,timeout] } { + set timeout [target_info gdb,timeout]; + } + } else { + set timeout [target_info gdb,timeout]; } - set timeout [target_info gdb,timeout]; } set code [catch {uplevel remote_expect host $args} string]; if [target_info exists gdb,timeout] { if [info exists oldt] { - set timeout oldt + set timeout $oldt } else { unset timeout } |