From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11760 invoked by alias); 2 Dec 2016 17:30:49 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 11751 invoked by uid 89); 2 Dec 2016 17:30:48 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-4.8 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 02 Dec 2016 17:30:38 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 98B74338869; Fri, 2 Dec 2016 17:30:36 +0000 (UTC) Received: from [127.0.0.1] (ovpn03.gateway.prod.ext.phx2.redhat.com [10.5.9.3]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uB2HUZHn027159; Fri, 2 Dec 2016 12:30:35 -0500 Subject: Re: [PATCH] Remove unneeded pattern matching in gdb.base/maint.exp To: Luis Machado , gdb-patches@sourceware.org References: <1480698345-9779-1-git-send-email-lgustavo@codesourcery.com> From: Pedro Alves Message-ID: Date: Fri, 02 Dec 2016 17:30:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 In-Reply-To: <1480698345-9779-1-git-send-email-lgustavo@codesourcery.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2016-12/txt/msg00103.txt.bz2 On 12/02/2016 05:05 PM, Luis Machado wrote: > This gets rid of more useless pattern matching cases in gdb.base/maint.exp. It > is a follow-on to the previous patch that only removed the timeouts. > > Regression-checked by running gdb.base/maint.exp. > > gdb/testsuite/ChangeLog: > > 2016-12-02 Luis Machado > > * gdb.base/maint.exp: Remove gdb_prompt and timeout handling in > gdb_test_multiple calls. > Use gdb_test instead of gdb_test_multiple when possible. > --- > gdb/testsuite/gdb.base/maint.exp | 27 ++++++++------------------- > 1 file changed, 8 insertions(+), 19 deletions(-) > > diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp > index 17c606b..9d08ff1 100644 > --- a/gdb/testsuite/gdb.base/maint.exp > +++ b/gdb/testsuite/gdb.base/maint.exp > @@ -71,7 +71,7 @@ gdb_test "maint print registers" "Name.*Nr.*Rel.*Offset.*Size.*Type.*" > gdb_test_no_output "mt set per on" "mt set per on for expand-symtabs" > gdb_test_multiple "mt expand-symtabs $subdir/break\[.\]c$" \ > "mt expand-symtabs" { > - -re "#compunits: (1|2) \\(\[+\](0|1|2)\\),.*$gdb_prompt $" { > + -re "#compunits: (1|2) \\(\[+\](0|1|2)\\),.*" { Why are you removing this ... > # This should expand at most two primary symtabs. > # "Normally" it will not expand any, because the symtab > # holding "main" will already have been expanded, but if the > @@ -93,7 +93,7 @@ if ![runto_main] then { > # If we're using .gdb_index there will be no psymtabs. > set have_gdb_index 0 > gdb_test_multiple "maint info sections .gdb_index" "check for .gdb_index" { > - -re ": .gdb_index.*$gdb_prompt $" { > + -re ": .gdb_index.*" { > set have_gdb_index 1 > } ... and this ... > -re ".*$gdb_prompt $" { > @@ -287,29 +287,18 @@ gdb_test "cd [standard_output_file {}]" \ > "cd to objdir" > > gdb_test_multiple "maint print msymbols msymbols_output2 ${testfile}" "maint print msymbols" { > - -re "^maint print msymbols msymbols_output2 \[^\n\]*\r\n$gdb_prompt $" { > + -re "^maint print msymbols msymbols_output2 \[^\n\]*\r\n" { ... and this? > gdb_test_multiple "shell ls msymbols_output2" "maint print msymbols" { > -re "msymbols_output2\r\n$gdb_prompt $" { > - gdb_test_multiple "shell grep factorial msymbols_output2" "maint print msymbols" { > - -re "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*$gdb_prompt $" { > - pass "maint print msymbols" > - } > - -re ".*$gdb_prompt $" { > - fail "maint print msymbols" > - } > - } > - gdb_test "shell rm -f msymbols_output2" ".*" \ > - "shell rm -f msymbols_output2" > - } > - -re ".*$gdb_prompt $" { > - fail "maint print msymbols" > + gdb_test "shell grep factorial msymbols_output2" \ > + "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*" \ > + "maint print msymbols" > + gdb_test "shell rm -f msymbols_output2" ".*" > } > } > } > - -re ".*$gdb_prompt $" { > - fail "maint print msymbols" > - } > } > + > gdb_test "cd ${mydir}" \ > "Working directory [string_to_regexp ${mydir}]\..*" \ > "cd to mydir" > This part looks OK. Thanks, Pedro Alves