* gdb.base/maint.exp (maint print statistics): Increase timeout for

	all targets.  Restore old timeout afterwards.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d3d76ef06f97134884fa605554800f5f5cc34695..14285cff40db5fd1619d2eecc7c5426f221a46bc 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-15  Doug Evans  <dje@google.com>
+
+       * gdb.base/maint.exp (maint print statistics): Increase timeout for
+       all targets.  Restore old timeout afterwards.
+
 2010-11-12  Nathan Froyd  <froydnj@codesourcery.com>
 
        * gdb.stabs/gdb11479.exp: Use runto_main.

diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp
index 8346bec8b319428421d3fb348c488fbd62f59518..27577409abd224ca56819152e768a3aaea8628bb 100644 (file)
--- a/gdb/testsuite/gdb.base/maint.exp
+++ b/gdb/testsuite/gdb.base/maint.exp
@@ -143,11 +143,10 @@ gdb_test "maint demangle main" "Can't demangle \"main\""
 
 # The timeout value is raised, because printing all the symbols and
 # statistical information about Cygwin and Windows libraries takes a lot
-# of time.
-if [istarget "*-*-cygwin*"] {
-       set oldtimeout $timeout
-       set timeout [expr $timeout + 500]
-}
+# of time.  This has been noticed on some linux systems too, so just raise
+# the timeout globally.
+set oldtimeout $timeout
+set timeout [expr $timeout + 500]
 
 send_gdb "maint print statistics\n"
 gdb_expect  {
@@ -163,6 +162,8 @@ gdb_expect  {
     timeout         { fail "(timeout) maint print statistics" }
 }
 
+set timeout $oldtimeout
+
 # There aren't any ...
 gdb_test_no_output "maint print dummy-frames"