From b448cca522294026d0014bad082b76dfb4297fe2 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Tue, 27 Oct 2020 23:17:09 +0100 Subject: [PATCH] [gdb/testsuite] Fix gdb.base/multi-forks.exp timeout with -readnow When running test-case gdb.base/multi-forks.exp with target board readnow, we run into: ... FAIL: gdb.base/multi-forks.exp: run to exit 1 (timeout) ... Fix this by using exp_continue. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2020-10-27 Tom de Vries * gdb.base/multi-forks.exp: Use exp_continue to fix timeout. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.base/multi-forks.exp | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3100ced0511..ffbc01dde63 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-10-27 Tom de Vries + + * gdb.base/multi-forks.exp: Use exp_continue to fix timeout. + 2020-10-27 Tom de Vries * gdb.base/maint.exp: Update for -readnow. diff --git a/gdb/testsuite/gdb.base/multi-forks.exp b/gdb/testsuite/gdb.base/multi-forks.exp index 8aa349bc117..5d5a0787292 100644 --- a/gdb/testsuite/gdb.base/multi-forks.exp +++ b/gdb/testsuite/gdb.base/multi-forks.exp @@ -155,7 +155,17 @@ gdb_test_no_output "set detach off" "set detach off" # for {set i 1} {$i <= 15} {incr i} { - gdb_test "continue" "Breakpoint .* main .*exit.*" "run to exit $i" + gdb_test_multiple "continue" "run to exit $i" { + -re "Continuing\.\r\n" { + exp_continue + } + -re "\[New inferior $decimal \\(process $decimal\\)\]\r\n" { + exp_continue + } + -re -wrap "Breakpoint .* main .*exit.*" { + pass $gdb_test_name + } + } gdb_test "info inferior" " 2 .* 3 .* 4 .* 5 .*" "info inferior $i" gdb_test "inferior $i + 1" "(_dl_sysinfo_int80|fork|__kernel_(v|)syscall).*" \ "inferior $i" -- 2.30.2