From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-buildbot@sergiodj.net>
Received: from kwanyin.sergiodj.net (kwanyin.sergiodj.net [158.69.185.54])
 by sourceware.org (Postfix) with ESMTPS id 1D5683861C58
 for <gdb-testers@sourceware.org>; Sat, 14 Mar 2020 06:22:49 +0000 (GMT)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [binutils-gdb] [gdb/testsuite] Fix gdb.mi/gdb2549.exp with check-read1
From: gdb-buildbot@sergiodj.net
To: gdb-testers@sourceware.org
Message-Id: <478e490a4df79436d678ca5f5f1d7c7ac7befa79@gdb-build>
Date: Sat, 14 Mar 2020 02:22:46 -0400
X-Spam-Status: No, score=-25.0 required=5.0 tests=GIT_PATCH_0, GIT_PATCH_1,
 GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,
 SPF_PASS autolearn=ham autolearn_force=no version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
 server2.sourceware.org
X-BeenThere: gdb-testers@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gdb-testers mailing list <gdb-testers.sourceware.org>
List-Unsubscribe: <http://sourceware.org/mailman/options/gdb-testers>,
 <mailto:gdb-testers-request@sourceware.org?subject=unsubscribe>
List-Archive: <http://sourceware.org/pipermail/gdb-testers/>
List-Post: <mailto:gdb-testers@sourceware.org>
List-Help: <mailto:gdb-testers-request@sourceware.org?subject=help>
List-Subscribe: <http://sourceware.org/mailman/listinfo/gdb-testers>,
 <mailto:gdb-testers-request@sourceware.org?subject=subscribe>
X-List-Received-Date: Sat, 14 Mar 2020 06:22:49 -0000

*** TEST RESULTS FOR COMMIT 478e490a4df79436d678ca5f5f1d7c7ac7befa79 ***

commit 478e490a4df79436d678ca5f5f1d7c7ac7befa79
Author:     Tom de Vries <tdevries@suse.de>
AuthorDate: Tue Mar 3 11:34:53 2020 +0100
Commit:     Tom de Vries <tdevries@suse.de>
CommitDate: Tue Mar 3 11:34:53 2020 +0100

    [gdb/testsuite] Fix gdb.mi/gdb2549.exp with check-read1
    
    When running gdb.mi/gdb2549.exp with check-read1, we get:
    ...
    Running src/gdb/testsuite/gdb.mi/gdb2549.exp ...
    FAIL: gdb.mi/gdb2549.exp: register values t (timeout)
    ...
    
    The problem is that the command generates a lot of output, which is matched by
    a single '.*':
    ...
    mi_gdb_test "666-data-list-register-values t" \
      "666\\^done,register-values=\\\[\{number=\"$decimal\",value=\"$binary\"\}.*\\\]" \
      "register values t"
    ...
    
    Fix this by splitting up the matching and calling exp_continue after each
    number/value pair.
    
    Tested on x86_64-linux with make targets check and check-read1.
    
    gdb/testsuite/ChangeLog:
    
    2020-03-03  Tom de Vries  <tdevries@suse.de>
    
            * gdb.mi/gdb2549.exp: Fix "register values t" check-read1 timeout.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 73a05d3143..0563fec532 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-03  Tom de Vries  <tdevries@suse.de>
+
+	* gdb.mi/gdb2549.exp: Fix "register values t" check-read1 timeout.
+
 2020-03-03  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.mi/list-thread-groups-available.exp: Use -prompt syntax for
diff --git a/gdb/testsuite/gdb.mi/gdb2549.exp b/gdb/testsuite/gdb.mi/gdb2549.exp
index 0b4cb6be38..cc6441c8ec 100644
--- a/gdb/testsuite/gdb.mi/gdb2549.exp
+++ b/gdb/testsuite/gdb.mi/gdb2549.exp
@@ -51,6 +51,7 @@ proc register_tests_no_exec { } {
 proc register_tests { } {
     global hex
     global decimal
+    global mi_gdb_prompt
     set octal "\[0-7\]+"
     set binary "\[0-1\]+"
     set float "\\-?((\[0-9\]+(\\.\[0-9\]+)?(e\[-+\]\[0-9\]+)?)|(nan\\($hex\\)))"
@@ -71,9 +72,35 @@ proc register_tests { } {
 	    "555\\^done,register-values=\\\[\{number=\"$decimal\",value=\"$octal\"\}.*\\\]" \
 	    "register values o"
 
-    mi_gdb_test "666-data-list-register-values t" \
-	    "666\\^done,register-values=\\\[\{number=\"$decimal\",value=\"$binary\"\}.*\\\]" \
-	    "register values t"
+    set cmd "666-data-list-register-values t"
+    set test "register values t"
+    set state 0
+    gdb_test_multiple $cmd $test -prompt "$mi_gdb_prompt$" {
+	-re "666\\^done,register-values=\\\[" {
+	    if { $state == 0 } {
+		set state 1
+		exp_continue
+	    }
+	    fail $gdb_test_name
+	}
+	-re "\{number=\"$decimal\",value=\"$binary\"\}" {
+	    if { $state != 0 } {
+		set state 2
+		exp_continue
+	    }
+	    fail $gdb_test_name
+	}
+	-re "\{number=\"$decimal\",value=\"\[^\"\]*\"\}" {
+	    exp_continue
+	}
+	-re "\]\r\n$mi_gdb_prompt$" {
+	    if { $state == 2 } {
+		pass $gdb_test_name
+	    } else {
+		fail $gdb_test_name
+	    }
+	}
+    }
 }
 
 register_tests_no_exec