From 59bd512b9c54c6fa2bd951cd10a1ca1e6ffb3dcf Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 1 Aug 2019 10:48:11 +0200 Subject: [PATCH] [gdb/testsuite] Fix gdb.threads/fork-plus-threads.exp timeout with check-run1 With gdb.threads/fork-plus-threads.exp and check-run1 we get: ... FAIL: gdb.threads/fork-plus-threads.exp: detach-on-fork=off: \ inferior 1 exited (timeout) ... Fix this by calling exp_continue for new thread and thread exited messages. Tested on x86_64-linux. gdb/testsuite/ChangeLog: 2019-08-01 Tom de Vries PR testsuite/24863 * gdb.threads/fork-plus-threads.exp: Fix check-run1 timeout by calling exp_continue for new thread and thread exited messages. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.threads/fork-plus-threads.exp | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 09921e0296..fc1c537c76 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-08-01 Tom de Vries + + PR testsuite/24863 + * gdb.threads/fork-plus-threads.exp: Fix check-run1 timeout by + calling exp_continue for new thread and thread exited messages. + 2019-08-01 Tom de Vries PR testsuite/24863 diff --git a/gdb/testsuite/gdb.threads/fork-plus-threads.exp b/gdb/testsuite/gdb.threads/fork-plus-threads.exp index d4d0f18232..340a8df266 100644 --- a/gdb/testsuite/gdb.threads/fork-plus-threads.exp +++ b/gdb/testsuite/gdb.threads/fork-plus-threads.exp @@ -87,6 +87,14 @@ proc do_test { detach_on_fork } { set saw_thread_stopped 1 exp_continue } + -re "Thread \[^\r\n\]+ exited" { + # Avoid timeout with check-read1 + exp_continue + } + -re "New Thread \[^\r\n\]+" { + # Avoid timeout with check-read1 + exp_continue + } -re "Inferior 1 \(\[^\r\n\]+\) exited normally" { pass $test } -- 2.34.1