[pushed,gdb/testsuite] Fix gdb.python/py-breakpoint.exp timeouts
Commit Message
On powerpc64le-linux, I run into two timeouts:
...
FAIL: gdb.python/py-breakpoint.exp: test_watchpoints: \
Test watchpoint write (timeout)
FAIL: gdb.python/py-breakpoint.exp: test_bkpt_internal: \
Test watchpoint write (timeout)
...
In this case, hw watchpoints are not supported, and using sw watchpoints
is slow.
Most of the time is spent in handling a try-catch, which triggers a malloc. I
think this bit is more relevant for the "catch throw" part of the test-case,
so fix the timeouts by setting the watchpoints after the try-catch.
Tested on x86_64-linux and powerpc64le-linux.
---
gdb/testsuite/gdb.python/py-breakpoint.c | 2 ++
gdb/testsuite/gdb.python/py-breakpoint.exp | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
base-commit: eae679b9c7760e994c85695946c6b69a227dc69b
@@ -60,6 +60,8 @@ int main (int argc, char *argv[])
/* Nothing. */
}
+ i = -1; /* Past throw-catch. */
+
for (i = 0; i < 10; i++)
{
result += multiply (foo); /* Break at multiply. */
@@ -36,6 +36,8 @@ if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} ${options}]
return -1
}
+set past_throw_catch_line [gdb_get_line_number "Past throw-catch."]
+
proc_with_prefix test_bkpt_basic { } {
global srcfile testfile hex decimal
@@ -293,7 +295,7 @@ proc_with_prefix test_watchpoints { } {
gdb_test_no_output "set can-use-hw-watchpoints 0" ""
}
- if {![runto_main]} {
+ if {![runto $srcfile:$::past_throw_catch_line]} {
return 0
}
@@ -316,7 +318,7 @@ proc_with_prefix test_bkpt_internal { } {
if {!$allow_hw_watchpoint_tests_p} {
gdb_test_no_output "set can-use-hw-watchpoints 0" ""
}
- if {![runto_main]} {
+ if {![runto $srcfile:$::past_throw_catch_line]} {
return 0
}
delete_breakpoints