[PATCH] gdb/testsuite: increase timeout relatively to current one in huge.exp

[PATCH] gdb/testsuite: increase timeout relatively to current one in huge.exp

[Jan Vrany]

I occasionally run GDB testsuite on sluggish targets that need higher
timeout. The usual remedy I use is to set timeout to higher value in
site.exp.

This does not help with gdb.fortran/huge.exp, gdb.base/huge.exp and
gdb.ada/huge.exp, which set the timeout to fixed value of 30,
regardless of whether the timeout has been increased or not, causing
them to fail on some of my machines.

This commit fixes the problem by increasing the timeout relatively to
a multiple of current timeout in all three testcases.
---
 gdb/testsuite/gdb.ada/huge.exp     | 2 +-
 gdb/testsuite/gdb.base/huge.exp    | 2 +-
 gdb/testsuite/gdb.fortran/huge.exp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/huge.exp b/gdb/testsuite/gdb.ada/huge.exp
index 7bf70037f38..d0fc12025f7 100644
--- a/gdb/testsuite/gdb.ada/huge.exp
+++ b/gdb/testsuite/gdb.ada/huge.exp
@@ -52,7 +52,7 @@ foreach_with_prefix varname {Arr Packed_Arr} {
     clean_restart ${testfile}
 
     save_vars { timeout } {
-	set timeout 30
+	set timeout [expr {$timeout * 3}]
 
 	if {![runto "foo"]} {
 	    return
diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.exp
index 4d164661608..cd4d8e36621 100644
--- a/gdb/testsuite/gdb.base/huge.exp
+++ b/gdb/testsuite/gdb.base/huge.exp
@@ -45,7 +45,7 @@ require {expr {$compilation_succeeded}}
 clean_restart $testfile
 
 save_vars { timeout } {
-    set timeout 30
+    set timeout [expr {$timeout * 3}]
 
     if {![runto_main]} {
 	return -1
diff --git a/gdb/testsuite/gdb.fortran/huge.exp b/gdb/testsuite/gdb.fortran/huge.exp
index 03ebdaac4bd..48e2ba4da0d 100644
--- a/gdb/testsuite/gdb.fortran/huge.exp
+++ b/gdb/testsuite/gdb.fortran/huge.exp
@@ -52,7 +52,7 @@ require {expr {$compilation_succeeded}}
 clean_restart ${::testfile}
 
 save_vars { timeout } {
-    set timeout 30
+    set timeout [expr {$timeout * 3}]
 
     if {![fortran_runto_main]} {
 	return -1
-- 
2.51.0

Re: [PATCH] gdb/testsuite: increase timeout relatively to current one in huge.exp

[Tom Tromey]

>>>>> "Jan" == Jan Vrany <jan.vrany@labware.com> writes:

Jan>      save_vars { timeout } {
Jan> -	set timeout 30
Jan> +	set timeout [expr {$timeout * 3}]

I think it is probably better to replace the save_vars / set timeout
with

    with_timeout_factor 3 { .. }

Tom