From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 88859 invoked by alias); 13 Jun 2018 11:50:02 -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 88835 invoked by uid 89); 13 Jun 2018 11:50:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx3-rdu2.redhat.com (HELO mx1.redhat.com) (66.187.233.73) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 13 Jun 2018 11:49:59 +0000 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 86B82857A3; Wed, 13 Jun 2018 11:49:58 +0000 (UTC) Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id E326D1116701; Wed, 13 Jun 2018 11:49:57 +0000 (UTC) Subject: Re: [PATCH, testsuite] Update gdb startup text in selftest.exp To: Tom de Vries , gdb-patches@sourceware.org, Tom Tromey References: <20180612140945.drjp7rent7mkeoam@localhost.localdomain> From: Pedro Alves Message-ID: <79521339-876f-f14a-c427-79f2e79f994a@redhat.com> Date: Wed, 13 Jun 2018 11:50:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <20180612140945.drjp7rent7mkeoam@localhost.localdomain> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2018-06/txt/msg00327.txt.bz2 [Tromey's current address fixed] Hi Tom, On 06/12/2018 03:10 PM, Tom de Vries wrote: > Hi, > > atm selftest.exp fails for me. > > One of the reasons is that in c61b06a19a34baab66e3809c7b41b0c31009ed9f (Remove > some text from --version output) an eol was added after "There is NO > WARRANTY, to the extent permitted by law". > > This patch updates the matching of the gdb startup message in selftest.exp > accordingly. > > Tested selftest.exp (with two other selftest.exp related fixes applied). > > OK for trunk? > > Thanks, > - Tom > > [gdb/testsuite] Update gdb startup text in selftest.exp You were probably already going to do it, but just in case, since it's not practice in gcc, please include the rationale above in the commit log (without the "Hi", "OK for trunk", etc. bits of course.) See "git log gdb/" for examples. OK with that change. That test could be made a lot more readable with use of multi_line. Thanks, Pedro Alves > > 2018-06-12 Tom de Vries > > * gdb.gdb/selftest.exp (test_with_self): Update gdb startup text. > > --- > gdb/testsuite/gdb.gdb/selftest.exp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp > index 20f34983ef..314bddb8bf 100644 > --- a/gdb/testsuite/gdb.gdb/selftest.exp > +++ b/gdb/testsuite/gdb.gdb/selftest.exp > @@ -66,7 +66,7 @@ proc test_with_self { } { > set test "xgdb is at prompt" > gdb_test_multiple "continue" $test { > -i "$inferior_spawn_id" > - -re "GNU gdb \[0-9\.\]*.*Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*License GPLv3\\+: GNU GPL version 3 or later .*This is free software: you are free to change and redistribute it.*There is NO WARRANTY, to the extent permitted by law. Type \"show copying\".*and \"show warranty\" for details.*This GDB was configured as .*$gdb_prompt $" { > + -re "GNU gdb \[0-9\.\]*.*Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*License GPLv3\\+: GNU GPL version 3 or later .*This is free software: you are free to change and redistribute it.*There is NO WARRANTY, to the extent permitted by law\..*Type \"show copying\".*and \"show warranty\" for details.*This GDB was configured as .*$gdb_prompt $" { > pass $test > } > } >