From 19d31cb3e82d4cf06ef7e593148b46234b1ac2ab Mon Sep 17 00:00:00 2001
From: Bob Manson <manson@cygnus>
Date: Fri, 23 May 1997 06:15:46 +0000
Subject: [PATCH] 	Make sure we keep the old value of timeout set
 properly.

---
 gdb/testsuite/lib/gdb.exp | 10 +++++++---
 1 file 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
 	}
-- 
2.7.4