gdb/testsuite/ChangeLog: * lib/gdb.exp (gdb_test_timeout): New global variable. Set it to timeout if not already set. (gdb_init): Reset the value of timeout to gdb_test_timeout. --- gdb/testsuite/lib/gdb.exp | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 9b06a2f..621fc3b 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -2410,7 +2410,22 @@ proc default_gdb_init { args } { } } +# The default timeout used when testing GDB commands. We want to use +# the same timeout as the default dejagnu timeout, unless the user has +# already provided a specific value (probably through a site.exp file). +global gdb_test_timeout +if ![info exists gdb_test_timeout] { + set gdb_test_timeout $timeout +} + proc gdb_init { args } { + # Reset the timeout value to the default. This way, any testcase + # that changes the timeout value without resetting it cannot affect + # the timeout used in subsequent testcases. + global gdb_test_timeout + global timeout + set timeout $gdb_test_timeout + return [eval default_gdb_init $args]; } -- 1.6.3.3