diff options
| author | Fred Fish <fnf@specifix.com> | 1996-06-28 00:30:45 +0000 |
|---|---|---|
| committer | Fred Fish <fnf@specifix.com> | 1996-06-28 00:30:45 +0000 |
| commit | 302fcffb7ec5984f646e2fb44d9f6502e722703f (patch) | |
| tree | e14899e361e7d9a1417ed56a324e19a82c4cc840 /gdb | |
| parent | a928fca19c9533b9213cba9898c29483e83a201b (diff) | |
| download | gdb-302fcffb7ec5984f646e2fb44d9f6502e722703f.zip gdb-302fcffb7ec5984f646e2fb44d9f6502e722703f.tar.gz gdb-302fcffb7ec5984f646e2fb44d9f6502e722703f.tar.bz2 | |
* lib/gdb.exp (default_gdb_start): When reporting a timeout during
gdb initialization, also report how long dejagnu waited. Restore
old timeout before doing error return. Temporarily increase timeout
by 3 minutes to allow for slow startups over heavy NFS use.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 16 |
2 files changed, 19 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index fbbc787..ec38b3a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +Thu Jun 27 10:54:58 1996 Fred Fish <fnf@cygnus.com> + + * lib/gdb.exp (default_gdb_start): When reporting a timeout during + gdb initialization, also report how long dejagnu waited. Restore + old timeout before doing error return. Temporarily increase timeout + by 3 minutes to allow for slow startups over heavy NFS use. + Tue Jun 25 19:59:17 1996 Fred Fish <fnf@cygnus.com> * lib/gdb.exp: Report timeout value for verbosity level 2. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 67f3fdc..501076b 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -604,6 +604,10 @@ oaded." # # start gdb -- start gdb running, default procedure # +# When running over NFS, particularly if running many simultaneous +# tests on different hosts all using the same server, things can +# get really slow. Give gdb at least 3 minutes to start up. +# proc default_gdb_start { } { global verbose global GDB @@ -619,8 +623,8 @@ proc default_gdb_start { } { } set oldtimeout $timeout - set timeout [expr "$timeout + 60"] - verbose "Timeout is now $timeout seconds" 2 + set timeout [expr "$timeout + 180"] + verbose "Timeout increased to $timeout seconds" 2 eval "spawn $GDB -nw $GDBFLAGS" expect { -re ".*\r\n$prompt $" { @@ -628,15 +632,19 @@ proc default_gdb_start { } { } -re "$prompt $" { perror "GDB never initialized." + set timeout $oldtimeout + verbose "Timeout restored to $timeout seconds" 2 return -1 } timeout { - perror "(timeout) GDB never initialized." + perror "(timeout) GDB never initialized after $timeout seconds." + set timeout $oldtimeout + verbose "Timeout restored to $timeout seconds" 2 return -1 } } set timeout $oldtimeout - verbose "Timeout is now $timeout seconds" 2 + verbose "Timeout restored to $timeout seconds" 2 # force the height to "unlimited", so no pagers get used send "set height 0\n" expect { |