Don't look at timeout unless it exists.

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index b8fe4004d9e35ce9512a2733d70aad0274b1cc69..4a55850367fd9c2509ddd8bab872b39a169c033b 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -856,12 +856,18 @@ proc send_gdb { string } {
 proc gdb_expect { args } {
     upvar timeout timeout
     if [target_info exists gdb,timeout] {
-       set oldt $timeout
+       if [info exists timeout] {
+           set oldt $timeout
+       }
        set timeout [target_info gdb,timeout];
     }
     set code [catch {uplevel remote_expect host $args} string];
-    if [info exists oldt] {
-       set timeout oldt
+    if [target_info exists gdb,timeout] {
+       if [info exists oldt] {
+           set timeout oldt
+       } else {
+           unset timeout
+       }
     }
 
     if {$code == 1} {