[binutils-gdb] [gdb/testsuite] Fix gdb.threads/multi-create-ns-info-thr.exp

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=4a11703a04c64d34e79d51ad62dad176c92462c8

commit 4a11703a04c64d34e79d51ad62dad176c92462c8
Author: Tom de Vries <tdevries@suse.de>
Date:   Tue Jun 8 10:04:44 2021 +0200

    [gdb/testsuite] Fix gdb.threads/multi-create-ns-info-thr.exp
    
    With a testsuite setup modified to make expect wait a little bit longer for
    gdb output (see PR27957), I reliably run into:
    ...
    PASS: gdb.threads/multi-create-ns-info-thr.exp: continue to breakpoint 1
    FAIL: gdb.threads/multi-create-ns-info-thr.exp: continue to breakpoint 2 \
      (timeout)
    ...
    
    This is due to this regexp:
    ...
           -re "Breakpoint $decimal,.*$srcfile:$bp_location1" {
    ...
    consuming several lines using the ".*" part, while it's intended to match one
    line looking like this:
    ...
    Thread 1 "multi-create-ns" hit Breakpoint 2, create_function () \
      at multi-create.c:45^M
    ...
    
    Fix this by limiting the regexp to one line.
    
    Tested on x86_64-linux.
    
    gdb/testsuite/ChangeLog:
    
    2021-06-08  Tom de Vries  <tdevries@suse.de>
    
            * gdb.threads/multi-create-ns-info-thr.exp: Limit breakpoint regexp to
            one line.

Diff:
---
 gdb/testsuite/ChangeLog                                | 5 +++++
 gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d89ef4a00cf..dc921257de1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2021-06-08  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.threads/multi-create-ns-info-thr.exp: Limit breakpoint regexp to
+	one line.
+
 2021-06-08  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.base/sect-cmd.exp: Use gdb_test.  Use -wrap "".  Fix
diff --git a/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp b/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
index 2fb52238798..1b32637e877 100644
--- a/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
+++ b/gdb/testsuite/gdb.threads/multi-create-ns-info-thr.exp
@@ -45,7 +45,7 @@ gdb_test_multiple $test $test {
 for {set i 0} {$i < 32} {incr i} {
     set test "continue to breakpoint $i"
     gdb_test_multiple "" $test {
-	-re "Breakpoint $decimal,.*$srcfile:$bp_location1" {
+	-re "Breakpoint $decimal,\[^\r\n\]*$srcfile:$bp_location1" {
 	    pass $test
 	}
     }