diff options
| author | Yao Qi <yao.qi@linaro.org> | 2015-04-15 12:46:58 +0100 |
|---|---|---|
| committer | Yao Qi <yao.qi@linaro.org> | 2015-04-15 12:46:58 +0100 |
| commit | 45fd756cafe258b9792b86e1f5df823ec0b848b4 (patch) | |
| tree | b5b92571334a99e4481e13a596e5cf9788e4b8f2 /gdb/testsuite/gdb.base/watchpoint-solib.exp | |
| parent | 78e9aa70febc3985a2c88dbc0c7a87d214231c3d (diff) | |
| download | gdb-45fd756cafe258b9792b86e1f5df823ec0b848b4.zip gdb-45fd756cafe258b9792b86e1f5df823ec0b848b4.tar.gz gdb-45fd756cafe258b9792b86e1f5df823ec0b848b4.tar.bz2 | |
Increase timeout in watch-bitfields.exp for software watchpoint
I see the following two timeout fails on pandaboard (arm-linux target),
FAIL: gdb.base/watch-bitfields.exp: -location watch against bitfields: continue until exit (timeout)
FAIL: gdb.base/watch-bitfields.exp: regular watch against bitfields: continue until exit (timeout)
In this test, more than one watchpoint is used, so the following
watchpoint requests fall back to software watchpoint, so that GDB
will single step all the way and it is very slow.
This patch is to copy the fix from
[PATCH] GDB/testsuite: Correct gdb.base/watchpoint-solib.exp timeout tweak
https://sourceware.org/ml/gdb-patches/2014-07/msg00716.html
I find the left-over of this patch review is to factor out code into
a procedure, so I do that in this patch.
Re-run tests watch-bitfields.exp, watchpoint-solib.exp, sigall-reverse.exp,
and until-precsave.exp on pandaboard, no regression.
gdb/testsuite:
2015-04-15 Pedro Alves <palves@redhat.com>
Yao Qi <yao.qi@linaro.org>
* gdb.base/watch-bitfields.exp (test_watch_location): Increase
timeout by factor of 4.
(test_regular_watch): Likewise.
* gdb.base/watchpoint-solib.exp: Use with_timeout_factor.
* gdb.reverse/sigall-reverse.exp: Likewise.
* gdb.reverse/until-precsave.exp: Likewise.
* lib/gdb.exp (with_timeout_factor): New proc.
(gdb_expect): Move some code to ...
(get_largest_timeout): ... here. New procedure.
Diffstat (limited to 'gdb/testsuite/gdb.base/watchpoint-solib.exp')
| -rw-r--r-- | gdb/testsuite/gdb.base/watchpoint-solib.exp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/gdb/testsuite/gdb.base/watchpoint-solib.exp b/gdb/testsuite/gdb.base/watchpoint-solib.exp index 85e83f7..9475b37 100644 --- a/gdb/testsuite/gdb.base/watchpoint-solib.exp +++ b/gdb/testsuite/gdb.base/watchpoint-solib.exp @@ -75,17 +75,8 @@ 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 +with_timeout_factor 30 { + gdb_test "continue" ".*Breakpoint 2.*foo.*" "continue to foo again" } -set timeout [expr $oldtimeout * 30] - -gdb_test "continue" ".*Breakpoint 2.*foo.*" "continue to foo again" - -set timeout $savedtimeout gdb_test "continue" ".*New value = 1.*" "continue to watchpoint hit again" |