From patchwork Fri May 24 02:37:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 32841 Received: (qmail 77505 invoked by alias); 24 May 2019 02:37:40 -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 77497 invoked by uid 89); 24 May 2019 02:37:39 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 spammy=HX-Spam-Relays-External:Sendmail, H*RU:Sendmail X-HELO: smtp.polymtl.ca Received: from smtp.polymtl.ca (HELO smtp.polymtl.ca) (132.207.4.11) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 24 May 2019 02:37:37 +0000 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id x4O2bQlf032033 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 23 May 2019 22:37:31 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp.polymtl.ca x4O2bQlf032033 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polymtl.ca; s=default; t=1558665453; bh=7RD6qKcqgwxSNir3PB34Nbd8Jk5ar2SRdnQmc6crvJ8=; h=Subject:To:Cc:References:From:Date:In-Reply-To:From; b=qgLPxKP72prCNoBQoSEdSstdtFwXGg26aHUDViIU2+N4yymS9L5ojbquWYuim/LT4 fM+cgMjWglW5/5agrK4W9r1sWAva5nkblH6phEFQsFhQEoc3yvTw6erUIUCC3tKXHg AknUKiuvcKE5A5rVRRoAG+snLLhHKHd7C5ya3Zp0= Received: from [10.0.0.11] (unknown [192.222.164.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by simark.ca (Postfix) with ESMTPSA id 2620A1E623; Thu, 23 May 2019 22:37:26 -0400 (EDT) Subject: Re: [PATCH][gdb/testsuite] Add test-case for gdb-add-index.sh To: Tom de Vries , gdb-patches@sourceware.org Cc: Pedro Alves References: <20190507160800.GA29009@delia> From: Simon Marchi Message-ID: <8bd474c7-13df-ae4e-378e-ed888e96bd1a@polymtl.ca> Date: Thu, 23 May 2019 22:37:25 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190507160800.GA29009@delia> X-IsSubscribed: yes Hi Tom, On 2019-05-07 12:08 p.m., Tom de Vries wrote: > Hi, > > Add a test-case gdb.dwarf2/gdb-add-index.exp to test > gdb/contrib/gdb-add-index.sh. > > Tested with x86_64-linux. > > OK for trunk? > > Thanks, > - Tom > > [gdb/testsuite] Add test-case for gdb-add-index.sh > > gdb/testsuite/ChangeLog: > > 2019-05-07 Tom de Vries > > * gdb.dwarf2/gdb-add-index.exp: New file. > > --- > gdb/testsuite/gdb.dwarf2/gdb-add-index.exp | 69 ++++++++++++++++++++++++++++++ > 1 file changed, 69 insertions(+) > > diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp > new file mode 100644 > index 0000000000..39286ec2e3 > --- /dev/null > +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp > @@ -0,0 +1,69 @@ > +# Copyright 2019 Free Software Foundation, Inc. > + > +# This program is free software; you can redistribute it and/or modify > +# it under the terms of the GNU General Public License as published by > +# the Free Software Foundation; either version 3 of the License, or > +# (at your option) any later version. > +# > +# This program is distributed in the hope that it will be useful, > +# but WITHOUT ANY WARRANTY; without even the implied warranty of > +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > +# GNU General Public License for more details. > +# > +# You should have received a copy of the GNU General Public License > +# along with this program. If not, see . > + > +load_lib dwarf.exp > + > +# This test can only be run on targets which support DWARF-2. > +if {![dwarf2_support]} { > + return 0 > +} > + > +standard_testfile main.c > + > +if { [prepare_for_testing "failed to prepare" "${testfile}" \ > + [list ${srcfile}]] } { > + return -1 > +} > + > +# Add a .gdb_index section to PROGRAM. > +# PROGRAM is assumed to be the output of standard_output_file. > +# Returns the path of the program or "" if there is a failure. > +# If there is a failure it will have already been logged. > + > +proc add_gdb_index { program } { > + global srcdir GDB env > + set contrib_dir "$srcdir/../contrib" > + set env(GDB) $GDB > + exec $contrib_dir/gdb-add-index.sh $program > + return ${program} > +} Maybe make this proc return true/false or 1/0, since it only needs to report success/failure? > + > +# Build a copy of the program with an index (.gdb_index/.debug_names). > +# But only if the toolchain didn't already create one: gdb doesn't support > +# building an index from a program already using one. > + > +set test "check if index present" > +gdb_test_multiple "mt print objfiles ${testfile}" $test { > + -re "gdb_index.*${gdb_prompt} $" { > + set binfile_with_index $binfile > + } > + -re "debug_names.*${gdb_prompt} $" { > + set binfile_with_index $binfile > + } > + -re "Psymtabs.*${gdb_prompt} $" { > + set binfile_with_index [add_gdb_index $binfile] > + if { ${binfile_with_index} == "" } { > + return -1 > + } > + } > +} > + > +# Ok, we have a copy of $binfile with an index. > +# Restart gdb and verify the index was used. > + > +clean_restart ${binfile_with_index} > +gdb_test "mt print objfiles ${testfile}" \ > + "(gdb_index|debug_names).*" \ > + "index used" > I am getting an error like this when trying to run the test: --- ERROR: Exception caught while booting Guile. /home/simark/build/binutils-gdb/gdb/testsuite/../../gdb/gdb: warning: Could not complete Guile gdb module initialization from: /usr/local/share/gdb/guile/gdb/boot.scm. Limited Guile support is available. Suggest passing --data-directory=/path/to/gdb/data-directory. Python Exception No module named 'gdb': /home/simark/build/binutils-gdb/gdb/testsuite/../../gdb/gdb: warning: Could not load the Python gdb module from `/usr/local/share/gdb/python'. Limited Python support is available from the _gdb module. Suggest passing --data-directory=/path/to/gdb/data-directory. --- Since we want to run GDB from its build directory, we need to start it with --data-directory. The following change makes it work for me: Ideally, we would test both without the -dwarf-5 switch, and check for the presence of the .gdb_index section, then test with the -dwarf-5 switch, and check for the presence of the .debug_names section. But already having this test is better than no test at all, so the patch LGTM with the changes highlighted above. Simon diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp index 39286ec2e37f..035413d61c5b 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp @@ -33,9 +33,9 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" \ # If there is a failure it will have already been logged. proc add_gdb_index { program } { - global srcdir GDB env + global srcdir GDB env BUILD_DATA_DIRECTORY set contrib_dir "$srcdir/../contrib" - set env(GDB) $GDB + set env(GDB) "$GDB --data-directory=$BUILD_DATA_DIRECTORY" exec $contrib_dir/gdb-add-index.sh $program return ${program} }