From: Maciej W. Rozycki Date: Tue, 9 Sep 2014 16:03:24 +0000 (+0100) Subject: GDB/testsuite: Add/correct gdb.reverse timeout tweaks X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7b4159018eeef7e1c682c63c1b33ce9c064e7c65;p=binutils-gdb.git GDB/testsuite: Add/correct gdb.reverse timeout tweaks There are three cases in two scripts in the gdb.reverse subset that take a particularly long time. Two of them are already attempted to take care of by extending the timeout from the default. The remaining one has no precautions taken. The timeout extension is ineffective though, it is done by adding a constant rather than by scaling and as a result while it may work for target boards that get satisfied with the detault test timeout of 10s, it does not serve its purpose for slower ones. Here are indicative samples of execution times (in seconds) observed for these cases respectively, for an ARMv7 Panda board running Linux and a `-march=armv5te' multilib: PASS: gdb.reverse/sigall-reverse.exp: continue to signal exit elapsed: 385 PASS: gdb.reverse/until-precsave.exp: run to end of main elapsed: 4440 PASS: gdb.reverse/until-precsave.exp: save process recfile elapsed: 965 for the same board and a `-mthumb -march=armv5te' multilib: PASS: gdb.reverse/sigall-reverse.exp: continue to signal exit elapsed: 465 PASS: gdb.reverse/until-precsave.exp: run to end of main elapsed: 4191 PASS: gdb.reverse/until-precsave.exp: save process recfile elapsed: 669 and for QEMU in the system emulation mode and a `-march=armv4t' multilib: PASS: gdb.reverse/sigall-reverse.exp: continue to signal exit elapsed: 45 PASS: gdb.reverse/until-precsave.exp: run to end of main elapsed: 433 PASS: gdb.reverse/until-precsave.exp: save process recfile elapsed: 104 Based on the performance of other tests these two test configurations have their default timeout set to 450s and 60s respectively. The remaining two multilibs (`-mthumb -march=armv4t' and `-mthumb -march=armv7-a') do not produce test results usable enough to have data available for these cases. Based on these results I have tweaked timeouts for these cases as follows. This, together with a suitable board timeout setting, removes timeouts for these cases. Note that for the default timeout of 10s the new setting for the first case in gdb.reverse/until-precsave.exp is compatible with the old one, just a bit higher to keep the convention of longer timeouts to remain multiples of 30s. The second case there does not need such a high setting so I have lowered it a bit to avoid an unnecessary delay where this test case genuinely times out. * gdb.reverse/sigall-reverse.exp: Increase the timeout by a factor of 2 for a slow test case. Take the `gdb,timeout' target setting into account for this calculation. * gdb.reverse/until-precsave.exp: Increase the timeout by a factor of 15 and 3 respectively rather than adding 120 for a pair of slow test cases. Take the `gdb,timeout' target setting into account for this calculation. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 24fde49e6a6..d7eef34a3df 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,13 @@ +2014-09-09 Maciej W. Rozycki + + * gdb.reverse/sigall-reverse.exp: Increase the timeout by + a factor of 2 for a slow test case. Take the `gdb,timeout' + target setting into account for this calculation. + * gdb.reverse/until-precsave.exp: Increase the timeout by + a factor of 15 and 3 respectively rather than adding 120 + for a pair of slow test cases. Take the `gdb,timeout' + target setting into account for this calculation. + 2014-09-09 Maciej W. Rozycki * lib/gdb.exp (gdb_test_multiple): Remove code to select the diff --git a/gdb/testsuite/gdb.reverse/sigall-reverse.exp b/gdb/testsuite/gdb.reverse/sigall-reverse.exp index dc4f4b12695..fffc94e6d3e 100644 --- a/gdb/testsuite/gdb.reverse/sigall-reverse.exp +++ b/gdb/testsuite/gdb.reverse/sigall-reverse.exp @@ -262,9 +262,18 @@ gdb_test "continue" \ "get signal TERM" gdb_test "continue" "Breakpoint.*handle_TERM.*" "send signal TERM" +set savedtimeout $timeout +if { [target_info exists gdb,timeout] + && $timeout < [target_info gdb,timeout] } { + set oldtimeout [target_info gdb,timeout] +} else { + set oldtimeout $timeout +} +set timeout [expr $oldtimeout * 2] gdb_test "continue" "\[process \[0-9\]+ .*" "continue to signal exit" \ "The next instruction is syscall exit_group.* program...y. or n. " \ "yes" +set timeout $savedtimeout foreach sig [lreverse $signals] { test_one_sig_reverse $sig diff --git a/gdb/testsuite/gdb.reverse/until-precsave.exp b/gdb/testsuite/gdb.reverse/until-precsave.exp index 9169ad15f1b..23e557e043c 100644 --- a/gdb/testsuite/gdb.reverse/until-precsave.exp +++ b/gdb/testsuite/gdb.reverse/until-precsave.exp @@ -49,15 +49,22 @@ gdb_test "break $end_of_main" \ "BP at end of main" # This can take awhile. -set oldtimeout $timeout -set timeout [expr $oldtimeout + 120] +set savedtimeout $timeout +if { [target_info exists gdb,timeout] + && $timeout < [target_info gdb,timeout] } { + set oldtimeout [target_info gdb,timeout] +} else { + set oldtimeout $timeout +} +set timeout [expr $oldtimeout * 15] gdb_test "continue" "Breakpoint .* set breakpoint 10a here .*" "run to end of main" # So can this, against gdbserver, for example. +set timeout [expr $oldtimeout * 3] gdb_test "record save $precsave" \ "Saved core file $precsave with execution log\." \ "save process recfile" -set timeout $oldtimeout +set timeout $savedtimeout gdb_test "kill" "" "Kill process, prepare to debug log file" \ "Kill the program being debugged\\? \\(y or n\\) " "y"