aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Evans <dje@google.com>2010-11-15 17:25:09 +0000
committerDoug Evans <dje@google.com>2010-11-15 17:25:09 +0000
commitcb80163c46d401fb4e14934ac0e51f04e55237e7 (patch)
treed2467be87232a1aee5506d5d5800e7634cca4b8f /gdb/testsuite
parent * gdb.base/maint.exp (maint print statistics): Increase timeout for (diff)
downloadbinutils-gdb-cb80163c46d401fb4e14934ac0e51f04e55237e7.tar.gz
binutils-gdb-cb80163c46d401fb4e14934ac0e51f04e55237e7.tar.bz2
binutils-gdb-cb80163c46d401fb4e14934ac0e51f04e55237e7.zip
revert previous patch
Diffstat (limited to 'gdb/testsuite')
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/gdb.base/maint.exp11
2 files changed, 5 insertions, 11 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 14285cff40d..d3d76ef06f9 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,8 +1,3 @@
-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 27577409abd..8346bec8b31 100644
--- a/gdb/testsuite/gdb.base/maint.exp
+++ b/gdb/testsuite/gdb.base/maint.exp
@@ -143,10 +143,11 @@ 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. This has been noticed on some linux systems too, so just raise
-# the timeout globally.
-set oldtimeout $timeout
-set timeout [expr $timeout + 500]
+# of time.
+if [istarget "*-*-cygwin*"] {
+ set oldtimeout $timeout
+ set timeout [expr $timeout + 500]
+}
send_gdb "maint print statistics\n"
gdb_expect {
@@ -162,8 +163,6 @@ gdb_expect {
timeout { fail "(timeout) maint print statistics" }
}
-set timeout $oldtimeout
-
# There aren't any ...
gdb_test_no_output "maint print dummy-frames"