From: Bob Manson <manson@cygnus>
Date: Wed, 18 Jun 1997 05:10:11 +0000 (+0000)
Subject: 	lib/gdb.exp(gdb_expect): Handle getting a value for $timeout
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=66e38fb28258e39e62219b23c4593c868e537aa1;p=binutils-gdb.git

	lib/gdb.exp(gdb_expect): Handle getting a value for $timeout
	more gracefully.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 09c26a324ee..f31071887fe 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -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>
 
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 385695fd38a..0530f6eae32 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -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;