diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint-solib.exp | 18 |
2 files changed, 20 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index d7eef34..37fe6a1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,12 @@ 2014-09-09 Maciej W. Rozycki <macro@codesourcery.com> + * gdb.base/watchpoint-solib.exp: Increase the timeout by a factor + of 30 rather than hardcoding 120 for a slow test case. Take the + `gdb,timeout' target setting into account for this calculation. + Don't extend the timeout for the test cases that don't need it. + +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. diff --git a/gdb/testsuite/gdb.base/watchpoint-solib.exp b/gdb/testsuite/gdb.base/watchpoint-solib.exp index 1056549..5a79474 100644 --- a/gdb/testsuite/gdb.base/watchpoint-solib.exp +++ b/gdb/testsuite/gdb.base/watchpoint-solib.exp @@ -70,14 +70,22 @@ gdb_test_multiple "break foo" "set pending breakpoint" { } } -set prev_timeout $timeout -set timeout 120 - gdb_test "continue" ".*Breakpoint 2.*foo.*" "continue to foo" gdb_test "watch g" "atchpoint 3: g" "set watchpoint on g" gdb_test "continue" ".*New value = 1.*" "continue to watchpoint hit" rerun_to_main + +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 * 30] + gdb_test "continue" ".*Breakpoint 2.*foo.*" "continue to foo again" -gdb_test "continue" ".*New value = 1.*" "continue to watchpoint hit again" -set timeout $prev_timeout +set timeout $savedtimeout + +gdb_test "continue" ".*New value = 1.*" "continue to watchpoint hit again" |