Re: [patch] print-threads.exp: Extend timeout for slower tests.

[Jan Kratochvil <jan dot kratochvil at redhat dot com>]

On Mon, 07 Nov 2011 17:22:02 +0100, Joel Brobecker wrote:
> > >> +# Record the old timeout, we need to extend it for slower tests.
> > >> +set oldtimeout $timeout
> > >
> > > You can use global $gdb_test_timeout nowadays.
> > 
> > Thanks, I didn't know about gdb_test_timeout.
> > Still, I like the patch as is, one less global the code has to care about.
> 
> Same here.

I did not agree with Doug.  I think there was just some misunderstanding.

I was proposing the attached patch.

The very last line is sure redundant but I think it should be there for the
possibility of future test additions.

Found in Doug's original patch:
	set $timeout $oldtimeout
should have been:
	set timeout $oldtimeout


Thanks,
Jan


gdb/testsuite/
2011-11-08  Doug Evans  <dje@google.com>
	    Jan Kratochvil  <jan.kratochvil@redhat.com>

	* gdb.threads/print-threads.exp: Extend timeout for slower tests.

--- a/gdb/testsuite/gdb.threads/print-threads.exp
+++ b/gdb/testsuite/gdb.threads/print-threads.exp
@@ -106,12 +106,18 @@ test_all_threads "fast" 0
 runto_main
 gdb_test "break thread_function" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*print-threads.c, line \[0-9\]*\\." "break thread_function (2)"
 gdb_test_no_output "set var slow = 1"
+# Extend the timeout for slower tests.
+set timeout [expr $gdb_test_timeout + 120]
 test_all_threads "slow" 0
+set timeout $gdb_test_timeout
 
 runto_main
 gdb_test "break thread_function" "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*print-threads.c, line \[0-9\]*\\." "break thread_function (3)"
 gdb_test_no_output "set var slow = 1" "set var slow = 1 (2)"
 gdb_breakpoint "kill"
+# Extend the timeout for slower tests.
+set timeout [expr $gdb_test_timeout + 120]
 test_all_threads "slow with kill breakpoint" 1
+set timeout $gdb_test_timeout
 
 return 0