From patchwork Fri May 15 16:05:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 6746 Received: (qmail 98394 invoked by alias); 15 May 2015 16:05:51 -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 98384 invoked by uid 89); 15 May 2015 16:05:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 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 (AES256-GCM-SHA384 encrypted) ESMTPS; Fri, 15 May 2015 16:05:49 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t4FG5kTF005960 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Fri, 15 May 2015 12:05:47 -0400 Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t4FG5jss016827; Fri, 15 May 2015 12:05:46 -0400 Message-ID: <55561958.2030105@redhat.com> Date: Fri, 15 May 2015 17:05:44 +0100 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Patrick Palka , gdb-patches@sourceware.org Subject: Re: [PATCH] [COMMITTED] Fix PR gdb/17820 References: <1431523782-20409-1-git-send-email-patrick@parcs.ath.cx> In-Reply-To: <1431523782-20409-1-git-send-email-patrick@parcs.ath.cx> Hi Patrick, I noticed that the buildbots are showing that this new test is failing: https://sourceware.org/ml/gdb-testers/2015-q2/msg04164.html ~~~ ============================ new FAIL: gdb.base/gdbinit-history.exp: show commands <<2>> new FAIL: gdb.base/gdbinit-history.exp: show history size new FAIL: gdb.base/gdbinit-history.exp: show history size <<2>> ~~~ Logs at: http://gdb-build.sergiodj.net/cgit/Fedora-x86_64-m64/.git/tree/?h=master&id=aa0e3e6cdb70d805ec9a3c689861d936ab9c5c90 (follow the "plain" link on the right right) Then I noticed that the test is also failing on my machine (F20). :-) I went ahead and wrote a fix. What do you think? ------- From d75f038583bfa6265253e389c1012dc29eabd208 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 15 May 2015 16:47:23 +0100 Subject: [PATCH] Fix gdb.base/gdbinit-history.exp when HISTSIZE is set in the environment Some buildslaves are showing that this test is failing. E.g.,: https://sourceware.org/ml/gdb-testers/2015-q2/msg04164.html The issue is that HISTSIZE is set to 1000 in the environment that runs the tests (that's the default in Fedora, set in /etc/profile). We can trivially reproduce it with: $ HISTSIZE=1000 make check RUNTESTFLAGS="gdbinit-history.exp" (...) Running /home/pedro/gdb/mygit/src/gdb/testsuite/gdb.base/gdbinit-history.exp ... FAIL: gdb.base/gdbinit-history.exp: show history size FAIL: gdb.base/gdbinit-history.exp: show history size FAIL: gdb.base/gdbinit-history.exp: show commands gdb.log shows: ... (gdb) set height 0 (gdb) set width 0 (gdb) show history size The size of the command history is 1000. (gdb) FAIL: gdb.base/gdbinit-history.exp: show history size gdb/testsuite/ChangeLog: 2015-05-15 Pedro Alves * gdb.base/gdbinit-history.exp (test_gdbinit_history_setting): Unset HISTSIZE in the environment while testing and restore afterwards. --- gdb/testsuite/gdb.base/gdbinit-history.exp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gdb/testsuite/gdb.base/gdbinit-history.exp b/gdb/testsuite/gdb.base/gdbinit-history.exp index 474680a..7513934 100644 --- a/gdb/testsuite/gdb.base/gdbinit-history.exp +++ b/gdb/testsuite/gdb.base/gdbinit-history.exp @@ -29,6 +29,17 @@ proc test_gdbinit_history_setting { home size } { set old_home $env(HOME) set env(HOME) "$srcdir/$subdir/$home" + + # The HISTSIZE environment variable takes precedence over whatever + # history size is set in .gdbinit. Make sure the former is not + # set. + set have_old_histsize 0 + if [info exists env(HISTSIZE)] { + set old_histsize $env(HISTSIZE) + unset env(HISTSIZE) + set have_old_histsize 1 + } + set saved_internal_gdbflags $INTERNAL_GDBFLAGS set INTERNAL_GDBFLAGS [string map {"-nx" ""} $INTERNAL_GDBFLAGS] @@ -44,6 +55,11 @@ proc test_gdbinit_history_setting { home size } { } set INTERNAL_GDBFLAGS $saved_internal_gdbflags + + if {$have_old_histsize} { + set env(HISTSIZE) $old_histsize + } + set $env(HOME) $old_home }