From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1935 invoked by alias); 10 Sep 2012 17:29:30 -0000 Received: (qmail 1919 invoked by uid 22791); 10 Sep 2012 17:29:28 -0000 X-SWARE-Spam-Status: No, hits=-6.7 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 10 Sep 2012 17:29:12 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q8AHT84O005095 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 10 Sep 2012 13:29:08 -0400 Received: from barimba (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id q8AHT6uG010932 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Mon, 10 Sep 2012 13:29:07 -0400 From: Tom Tromey To: Yufeng Zhang Cc: "dje\@google.com" , gdb-patches@sourceware.org Subject: Re: [commit] Update help.exp References: <503DF8D2.8070807@arm.com> Date: Mon, 10 Sep 2012 17:29:00 -0000 In-Reply-To: <503DF8D2.8070807@arm.com> (Yufeng Zhang's message of "Wed, 29 Aug 2012 12:11:14 +0100") Message-ID: <871ui9eqhp.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: 2012-09/txt/msg00125.txt.bz2 >>>>> ">" == Yufeng Zhang writes: >> help.exp still fails with --without-python. "Convenience functions >> are defined via the Python API" is printed only when HAVE_PYTHON is >> defined (see >> http://sourceware.org/ml/gdb-patches/2012-08/msg00342.html). I ran into this too. Here's my proposed fix. Tested on x86-64 F16, both with and without Python enabled. Tom b/gdb/testsuite/ChangeLog: 2012-09-10 Tom Tromey * gdb.base/help.exp: Conditionally allow Python output. diff --git a/gdb/testsuite/gdb.base/help.exp b/gdb/testsuite/gdb.base/help.exp index 7fffd00..3270565 100644 --- a/gdb/testsuite/gdb.base/help.exp +++ b/gdb/testsuite/gdb.base/help.exp @@ -517,7 +517,7 @@ gdb_test "help show complaints" "Show max number of complaints about incorrect s # test help show confirm gdb_test "help show confirm" "Show whether to confirm potentially dangerous operations\." "help show confirm" # test help show convenience -gdb_test "help show convenience" "Debugger convenience \\(\"\\\$foo\"\\) variables and functions\.\[\r\n\]+Convenience variables are created when you assign them values;\[\r\n\]+thus, \"set \\\$foo=1\" gives \"\\\$foo\" the value 1\. Values may be any type\.\[\r\n\]+A few convenience variables are given values automatically:\[\r\n\]+\"\\\$_\"holds the last address examined with \"x\" or \"info lines\",\[\r\n\]+\"\\\$__\" holds the contents of the last address examined with \"x\"\.\[\r\n\]+Convenience functions are defined via the Python API\." "help show convenience" +gdb_test "help show convenience" "Debugger convenience \\(\"\\\$foo\"\\) variables and functions\.\[\r\n\]+Convenience variables are created when you assign them values;\[\r\n\]+thus, \"set \\\$foo=1\" gives \"\\\$foo\" the value 1\. Values may be any type\.\[\r\n\]+A few convenience variables are given values automatically:\[\r\n\]+\"\\\$_\"holds the last address examined with \"x\" or \"info lines\",\[\r\n\]+\"\\\$__\" holds the contents of the last address examined with \"x\"\.\[\r\n\]+(Convenience functions are defined via the Python API\.)?" "help show convenience" # test help show directories gdb_test "help show directories" "Show the search path for finding source files\.\[\r\n\]+\\\$cwd in the path means the current working directory\.\[\r\n\]+\\\$cdir in the path means the compilation directory of the source file\..*" "help show directories" # test help show editing