From c55809ce2dc022c3a8638aaa0f0f983fd4ce6cdf Mon Sep 17 00:00:00 2001
From: Bob Manson <manson@cygnus>
Date: Fri, 23 May 1997 06:05:12 +0000
Subject: [PATCH] 	* lib/gdb.exp(gdb_expect): Look for gdb,timeout target
 	feature.

---
 gdb/testsuite/ChangeLog   | 3 +++
 gdb/testsuite/lib/gdb.exp | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d520680e0f8..63c0fc7d624 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 Thu May 22 18:51:32 1997  Bob Manson  <manson@charmed.cygnus.com>
 
+	* lib/gdb.exp(gdb_expect): Look for gdb,timeout target
+	feature.
+
 	* config/proelf.exp: New entry.
 
 Wed May 21 21:23:16 1997  Bob Manson  <manson@charmed.cygnus.com>
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c29ce8133d2..b8fe4004d9e 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -854,7 +854,15 @@ proc send_gdb { string } {
 #
 
 proc gdb_expect { args } {
+    upvar timeout timeout
+    if [target_info exists gdb,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 {$code == 1} {
 	return -code error -errorinfo $errorInfo -errorcode $errorCode $string
-- 
2.30.2