* lib/gdb.exp(gdb_expect): Look for gdb,timeout target

	feature.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d520680e0f8c1dffb316225fcc6924fc88e4768c..63c0fc7d624c2050fc75f21f88e688efdcf3aab1 100644 (file)
--- 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 c29ce8133d2048ac8ef1378df10fc5c4feaf3c19..b8fe4004d9e35ce9512a2733d70aad0274b1cc69 100644 (file)
--- 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