[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  <tdevries@suse.de>

	PR testsuite/24863
	* gdb.threads/fork-plus-threads.exp: Fix check-run1 timeout by
	calling exp_continue for new thread and thread exited messages.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 09921e0..fc1c537 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,6 +1,12 @@
 2019-08-01  Tom de Vries  <tdevries@suse.de>
 
        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  <tdevries@suse.de>
+
+       PR testsuite/24863
        * gdb.base/structs.exp: Fix check-read1 timeout using
        gdb_test_sequence.
        * lib/gdb.exp (tcl_version_at_least, lrepeat): New proc.

diff --git a/gdb/testsuite/gdb.threads/fork-plus-threads.exp b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
index d4d0f18..340a8df 100644 (file)
--- 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
        }