From patchwork Tue Mar 3 10:36:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 38380 Received: (qmail 94151 invoked by alias); 3 Mar 2020 10:36:14 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 94143 invoked by uid 89); 3 Mar 2020 10:36:14 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 03 Mar 2020 10:36:13 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 0FC1FAD07 for ; Tue, 3 Mar 2020 10:36:11 +0000 (UTC) Date: Tue, 3 Mar 2020 11:36:09 +0100 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix gdb.mi/gdb2549.exp with check-read1 Message-ID: <20200303103608.GA16670@delia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes Hi, 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. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix gdb.mi/gdb2549.exp with check-read1 gdb/testsuite/ChangeLog: 2020-03-03 Tom de Vries * gdb.mi/gdb2549.exp: Fix "register values t" check-read1 timeout. --- gdb/testsuite/gdb.mi/gdb2549.exp | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) 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