From cb80163c46d401fb4e14934ac0e51f04e55237e7 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Mon, 15 Nov 2010 17:25:09 +0000 Subject: [PATCH] revert previous patch --- gdb/testsuite/ChangeLog | 5 ----- gdb/testsuite/gdb.base/maint.exp | 11 +++++------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 14285cf..d3d76ef 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,8 +1,3 @@ -2010-11-15 Doug Evans - - * gdb.base/maint.exp (maint print statistics): Increase timeout for - all targets. Restore old timeout afterwards. - 2010-11-12 Nathan Froyd * gdb.stabs/gdb11479.exp: Use runto_main. diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index 2757740..8346bec 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" -- 2.7.4