diff options
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.reverse/sigall-reverse.exp | 9 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.reverse/until-precsave.exp | 13 |
3 files changed, 29 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 24fde49..d7eef34 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,15 @@ 2014-09-09 Maciej W. Rozycki <macro@codesourcery.com> + * 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 <macro@codesourcery.com> + * lib/gdb.exp (gdb_test_multiple): Remove code to select the timeout, don't pass one down to gdb_expect. (gdb_expect): Rework timeout selection. diff --git a/gdb/testsuite/gdb.reverse/sigall-reverse.exp b/gdb/testsuite/gdb.reverse/sigall-reverse.exp index dc4f4b1..fffc94e 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 9169ad1..23e557e 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" |