From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16821 invoked by alias); 17 Mar 2011 09:11:38 -0000 Received: (qmail 16811 invoked by uid 22791); 17 Mar 2011 09:11:36 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mms2.broadcom.com (HELO mms2.broadcom.com) (216.31.210.18) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 17 Mar 2011 09:11:31 +0000 Received: from [10.9.200.131] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Thu, 17 Mar 2011 02:13:52 -0700 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB01.corp.ad.broadcom.com (10.9.200.131) with Microsoft SMTP Server id 8.2.247.2; Thu, 17 Mar 2011 02:11:23 -0700 Received: from [10.177.69.119] (unknown [10.177.69.119]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 0FBFA74D03 for ; Thu, 17 Mar 2011 02:11:22 -0700 (PDT) Message-ID: <4D81D03A.4090200@broadcom.com> Date: Thu, 17 Mar 2011 11:25:00 -0000 From: "Andrew Burgess" User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.2.15) Gecko/20110303 Lightning/1.0b2 Thunderbird/3.1.9 MIME-Version: 1.0 To: "gdb-patches@sourceware.org" Subject: Re: [PATCH] Clear GREP_OPTIONS environment variable. References: <4D807468.8020703@broadcom.com> <20110316161435.GR31264@adacore.com> In-Reply-To: <20110316161435.GR31264@adacore.com> Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 7bit 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-03/txt/msg00888.txt.bz2 On 16/03/2011 16:14, Joel Brobecker wrote: >> Andrew> The test gdb.base/maint.exp shells out from gdb to use grep. I >> Andrew> have GREP_OPTIONS="--color=auto" in my environment and this >> Andrew> causes the test to fail. The patch below clears this environment >> Andrew> variable before running gdb. Ok to apply? >> >> Andrew> 2011-03-15 Andrew Burgess >> Andrew> * lib/gdb.exp (default_gdb_start): Clear the GREP_OPTIONS >> Andrew> environment variable to make grep output more predictable. >> >> Ok. > > I think that this is OK too. However, I'm wondering whether, as > a followup, we should be moving this type of code to the gdb_init > routine, rather than putting it there. The idea is to run this > once per testcase, rather than once everytime we start a new GDB > process. > So the patch below moves the environment setup into gdb_init. I don't see any regressions here. If this is preferred then I can commit this instead of the original patch. Cheers, Andrew gdb/testsuite/ChangeLog 2011-03-15 Andrew Burgess * lib/gdb.exp (default_gdb_start,gdb_init): Clear the GREP_OPTIONS environment variable to make grep output more predictable. Move all the environment setup into gdb_init so it's done once per test case rather than each time we start gdb. * gdb.arch/altivec-abi.exp: Skip "generic" tests on 64-bit when diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 1b601af..7be05d1 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1316,21 +1316,6 @@ proc default_gdb_start { } { gdb_stop_suppressing_tests; - set env(LC_CTYPE) C - - # Don't let a .inputrc file or an existing setting of INPUTRC mess up - # the test results. Even if /dev/null doesn't exist on the particular - # platform, the readline library will use the default setting just by - # failing to open the file. OTOH, opening /dev/null successfully will - # also result in the default settings being used since nothing will be - # read from this file. - set env(INPUTRC) "/dev/null" - - # The gdb.base/readline.exp arrow key test relies on the standard VT100 - # bindings, so make sure that an appropriate terminal is selected. - # The same bug doesn't show up if we use ^P / ^N instead. - set env(TERM) "vt100" - verbose "Spawning $GDB $INTERNAL_GDBFLAGS $GDBFLAGS" if [info exists gdb_spawn_id] { @@ -2797,11 +2782,30 @@ proc gdb_init { args } { set banned_variables_traced 1 } - # We set LC_ALL and LANG to C so that we get the same messages as - # expected. + # We set LC_ALL, LC_CTYPE, and LANG to C so that we get the same + # messages as expected. setenv LC_ALL C + setenv LC_CTYPE C setenv LANG C + # Don't let a .inputrc file or an existing setting of INPUTRC mess up + # the test results. Even if /dev/null doesn't exist on the particular + # platform, the readline library will use the default setting just by + # failing to open the file. OTOH, opening /dev/null successfully will + # also result in the default settings being used since nothing will be + # read from this file. + setenv INPUTRC "/dev/null" + + # The gdb.base/readline.exp arrow key test relies on the standard VT100 + # bindings, so make sure that an appropriate terminal is selected. + # The same bug doesn't show up if we use ^P / ^N instead. + setenv TERM "vt100" + + # Some tests (for example gdb.base/maint.exp) shell out from gdb to use + # grep. Clear GREP_OPTIONS to make the behavoiur predictable, + # especially having color output turned on can cause tests to fail. + setenv GREP_OPTIONS "" + return [eval default_gdb_init $args]; }