[binutils-gdb] [gdb/testsuite] Fix check-read1 FAIL in attach-many-short-lived-threads.exp

[binutils-gdb] [gdb/testsuite] Fix check-read1 FAIL in attach-many-short-lived-threads.exp

[Tom de Vries]

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

commit 54c4382534f0c894434deca5eb89cd02661d6feb
Author: Tom de Vries <tdevries@suse.de>
Date:   Sat Mar 14 15:48:26 2020 +0100

    [gdb/testsuite] Fix check-read1 FAIL in attach-many-short-lived-threads.exp
    
    When running test-case gdb.threads/attach-many-short-lived-threads.exp with
    check-read1, I ran into:
    ...
    FAIL: gdb.threads/attach-many-short-lived-threads.exp: iter 1: \
      no new threads (timeout)
    ...
    
    Fix this by rewriting the gdb_test_multiple call using -lbl and exp_continue.
    
    Tested on x86_64-linux, with make targets check and check-read1.
    
    gdb/testsuite/ChangeLog:
    
    2020-03-14  Tom de Vries  <tdevries@suse.de>
    
            * gdb.threads/attach-many-short-lived-threads.exp: Read "info threads"
            result in line-by-line fashion.

Diff:
---
 gdb/testsuite/ChangeLog                                  |  5 +++++
 .../gdb.threads/attach-many-short-lived-threads.exp      | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a9c28522511..520e4533fa5 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-03-14  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.threads/attach-many-short-lived-threads.exp: Read "info threads"
+	result in line-by-line fashion.
+
 2020-03-14  Tom de Vries  <tdevries@suse.de>
 
 	* lib/gdb.exp (supports_statement_frontiers): New proc.
diff --git a/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp b/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
index 9a08e5738b2..13014347b40 100644
--- a/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
+++ b/gdb/testsuite/gdb.threads/attach-many-short-lived-threads.exp
@@ -108,12 +108,18 @@ proc test {} {
 	    sleep 1
 
 	    set test "no new threads"
-	    gdb_test_multiple "info threads" $test {
-		-re "New .*$gdb_prompt $" {
-		    fail $test
+	    set status 1
+	    gdb_test_multiple "info threads" $test -lbl {
+		-re "\r\n\[^\r\n\]*New " {
+		    set status 0
+		    exp_continue
 		}
-		-re "$gdb_prompt $" {
-		    pass $test
+		-re -wrap "" {
+		    if { $status == 1 } {
+			pass $gdb_test_name
+		    } else {
+			fail $gdb_test_name
+		    }
 		}
 	    }