From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9731 invoked by alias); 4 May 2011 14:42:29 -0000 Received: (qmail 9721 invoked by uid 22791); 4 May 2011 14:42:28 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 04 May 2011 14:42:14 +0000 Received: (qmail 20444 invoked from network); 4 May 2011 14:42:13 -0000 Received: from unknown (HELO scottsdale.localnet) (pedro@127.0.0.2) by mail.codesourcery.com with ESMTPA; 4 May 2011 14:42:13 -0000 From: Pedro Alves To: gdb-patches@sourceware.org Subject: Re: gdb.base/completion.exp - simplify with gdb_test_multiple Date: Wed, 04 May 2011 14:42:00 -0000 User-Agent: KMail/1.13.5 (Linux/2.6.35-28-generic; KDE/4.6.2; x86_64; ; ) Cc: Jan Kratochvil References: <201105031633.22925.pedro@codesourcery.com> <20110504142038.GA20147@host1.jankratochvil.net> In-Reply-To: <20110504142038.GA20147@host1.jankratochvil.net> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201105041542.25980.pedro@codesourcery.com> X-IsSubscribed: yes 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 X-SW-Source: 2011-05/txt/msg00091.txt.bz2 On Wednesday 04 May 2011 15:20:38, Jan Kratochvil wrote: > On Tue, 03 May 2011 17:33:22 +0200, Pedro Alves wrote: > > Anyone feel like taking a look at this? I tested this with and > > without Jan's read1 hack from PR testsuite/12649. > [...] > > --- src.orig/gdb/testsuite/lib/gdb.exp 2011-05-02 16:33:33.709463001 +0100 > > +++ src/gdb/testsuite/lib/gdb.exp 2011-05-03 00:20:33.159462999 +0100 > > @@ -593,7 +593,7 @@ proc gdb_test_multiple { command message > > set message $command > > } > > > > - if [string match "*\[\r\n\]" $command] { > > + if { $command != "" && [string match "*\[\r\n\]" $command] } { > > error "Invalid trailing newline in \"$message\" test" > > } > > > > This part should be dropped as it has no effect and it is not needed. Huh, indeed. Done, and committed. > > Attached patch either to commit on top of it or integrate it, I do not mind. Nice, go ahead, thanks. > > > Thanks, > Jan > > > gdb/ > 2011-05-04 Jan Kratochvil > > * gdb.base/completion.exp (complete help info wat): Rename to ... > (complete 'help info wat'): ... here. > Remove all `-re ".*' and `-re "^.*' redundant regexes. > (complete 'p 'arg', complete (2) 'p 'arg'): Remove redundant backslash. > > --- a/gdb/testsuite/gdb.base/completion.exp > +++ b/gdb/testsuite/gdb.base/completion.exp > @@ -270,7 +270,7 @@ gdb_test_multiple "" "$test" { > } > } > > -set test "complete help info wat" > +set test "complete 'help info wat'" > send_gdb "help info wat\t" > gdb_test_multiple "" "$test" { > -re "^help info watchpoints $" { > @@ -296,7 +296,7 @@ gdb_test_multiple "" "$test" { > -re "^p \"break1\\.c\"$" { > send_gdb "\n" > gdb_test_multiple "" "$test" { > - -re ".*$gdb_prompt $" { > + -re "$gdb_prompt $" { > pass "$test" > } > } > @@ -314,7 +314,7 @@ gdb_test_multiple "" "$test" { > -re "^p \"break1\\.c\"$" { > send_gdb "\n" > gdb_test_multiple "" "$test" { > - -re ".*$gdb_prompt $" { > + -re "$gdb_prompt $" { > pass "$test" > } > } > @@ -325,7 +325,7 @@ gdb_test_multiple "" "$test" { > } > } > > -set test "complete 'p \'arg'" > +set test "complete 'p 'arg'" > send_gdb "p 'arg\t" > gdb_test_multiple "" "$test" { > -re "^p 'arg\\\x07$" { > @@ -338,13 +338,13 @@ gdb_test_multiple "" "$test" { > } > } > > -set test "complete (2) 'p \'arg'" > +set test "complete (2) 'p 'arg'" > send_gdb "p 'arg\t" > gdb_test_multiple "" "$test" { > -re "^p 'arg\\\x07$" { > send_gdb "\t" > gdb_test_multiple "" "$test" { > - -re ".*argv.*$gdb_prompt " { > + -re "argv.*$gdb_prompt " { > send_gdb "\n" > gdb_test_multiple "" "$test" { > -re "(Invalid character constant\\.|Unmatched single quote\\.).*$gdb_prompt $" { > @@ -411,7 +411,7 @@ gdb_test_multiple "" "$test" { > -re "^p no_var_named_this-arg\\\x07$" { > send_gdb "\t" > gdb_test_multiple "" "$test" { > - -re ".*argv.*$gdb_prompt " { > + -re "argv.*$gdb_prompt " { > send_gdb "\n" > gdb_test_multiple "" "$test" { > -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" { > @@ -467,7 +467,7 @@ gdb_test_multiple "" "$test" { > } > } > } > - -re ".*argv.*$gdb_prompt $" { > + -re "argv.*$gdb_prompt $" { > send_gdb "\n" > gdb_test_multiple "" "$test" { > -re "No symbol \"no_var_named_this\" in current context\\..*$gdb_prompt $" { > @@ -485,7 +485,7 @@ gdb_test_multiple "" "$test" { > -re "^p values.0..a_field $" { > send_gdb "\n" > gdb_test_multiple "" "$test" { > - -re "^.* = 0.*$gdb_prompt $" { > + -re " = 0.*$gdb_prompt $" { > pass "$test" > } > } > @@ -498,7 +498,7 @@ gdb_test_multiple "" "$test" { > -re "^p values.0. . a_field $" { > send_gdb "\n" > gdb_test_multiple "" "$test" { > - -re "^.* = 0.*$gdb_prompt $" { > + -re " = 0.*$gdb_prompt $" { > pass "$test" > } > } > @@ -511,7 +511,7 @@ gdb_test_multiple "" "$test" { > -re "^p &values.0. -> a_field $" { > send_gdb "\n" > gdb_test_multiple "" "$test" { > - -re "^.* = .*0x\[0-9a-fA-F\]*.*$gdb_prompt $" { > + -re " = .*0x\[0-9a-fA-F\]*.*$gdb_prompt $" { > pass "$test" > } > } > @@ -608,7 +608,7 @@ gdb_test_multiple "" "$test" { > send_gdb "n\n" > exp_continue > } > - -re ".*$gdb_prompt $" { > + -re "$gdb_prompt $" { > pass "$test" > } > } > -- Pedro Alves