From: Tom de Vries <tdevries@suse.de>
Date: Wed, 5 May 2021 07:07:27 +0000 (+0200)
Subject: [gdb/testsuite] Fix gdb.threads/fork-plus-threads.exp with readnow
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=09f83f79f7d7334715e5fca9e89d5a97da5b0bd3;p=binutils-gdb.git

[gdb/testsuite] Fix gdb.threads/fork-plus-threads.exp with readnow

When running test-case gdb.threads/fork-plus-threads.exp with target board
readnow, I run into:
...
[LWP 9362 exited]^M
[New LWP 9365]^M
[New LWP 9363]^M
[New LWP 9364]^M
FAIL: gdb.threads/fork-plus-threads.exp: detach-on-fork=off: \
  inferior 1 exited (timeout)
...

There is code in the test-case to prevent timeouts with readnow:
...
       -re "Thread \[^\r\n\]+ exited" {
           # Avoid timeout with check-read1
           exp_continue
       }
       -re "New Thread \[^\r\n\]+" {
           # Avoid timeout with check-read1
           exp_continue
       }
...
but this doesn't trigger because we get LWP rather than Thread.

Fix this by making these regexps accept LWP as well.

Tested on x86_64-linux.

gdb/testsuite/ChangeLog:

2021-05-05  Tom de Vries  <tdevries@suse.de>

	* gdb.threads/fork-plus-threads.exp: Handle "New LWP <n>" and
	"LWP <n> exited" messages.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 326ba47961f..2be97a2f394 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-05-05  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.threads/fork-plus-threads.exp: Handle "New LWP <n>" and
+	"LWP <n> exited" messages.
+
 2021-05-04  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* gdb.python/py-type.exp (test_fields): Test calling fields on
diff --git a/gdb/testsuite/gdb.threads/fork-plus-threads.exp b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
index f5cfb279ce7..7fe3c603bcd 100644
--- a/gdb/testsuite/gdb.threads/fork-plus-threads.exp
+++ b/gdb/testsuite/gdb.threads/fork-plus-threads.exp
@@ -87,11 +87,11 @@ proc do_test { detach-on-fork } {
 	    set saw_thread_stopped 1
 	    exp_continue
 	}
-	-re "Thread \[^\r\n\]+ exited" {
+	-re "(Thread|LWP) \[^\r\n\]+ exited" {
 	    # Avoid timeout with check-read1
 	    exp_continue
 	}
-	-re "New Thread \[^\r\n\]+" {
+	-re "New (Thread|LWP) \[^\r\n\]+" {
 	    # Avoid timeout with check-read1
 	    exp_continue
 	}