aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.base/maint.exp11
2 files changed, 11 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d3d76ef..14285cf 100644
--- 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 8346bec..2757740 100644
--- 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"