From patchwork Sat Jul 1 15:23:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 21384 Received: (qmail 31906 invoked by alias); 1 Jul 2017 15:23:19 -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 31883 invoked by uid 89); 1 Jul 2017 15:23:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RP_MATCHES_RCVD, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=20170526, 2017-05-26 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 ESMTP; Sat, 01 Jul 2017 15:23:16 +0000 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id DCD2F80467; Sat, 1 Jul 2017 15:23:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com DCD2F80467 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=jan.kratochvil@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com DCD2F80467 Received: from host1.jankratochvil.net (ovpn-116-70.ams2.redhat.com [10.36.116.70]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C44305D9C9; Sat, 1 Jul 2017 15:23:13 +0000 (UTC) Date: Sat, 1 Jul 2017 17:23:10 +0200 From: Jan Kratochvil To: Simon Marchi Cc: gdb-patches@sourceware.org, Victor Leschuk Subject: [PATCH v3.1 1/5] cc-with-tweaks.sh: Use gdb-add-index.sh Message-ID: <20170701152310.GA5857@host1.jankratochvil.net> References: <149790572259.20186.14601775821404892582.stgit@host1.jankratochvil.net> <149790573738.20186.9976823318110510912.stgit@host1.jankratochvil.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.8.0 (2017-02-23) On Thu, 29 Jun 2017 21:40:32 +0200, Simon Marchi wrote: > On 2017-06-19 22:55, Jan Kratochvil wrote: > > +if [ "$want_index" = true ]; then > > + if [ -z "$GDB_ADD_INDEX" ] > > + then > > Nit: use the same style ("then" on same line or next line) for all ifs. Done. > > + if [ -f ./contrib/gdb-add-index.sh ] > > + then > > + GDB_ADD_INDEX="./contrib/gdb-add-index.sh" > > + elif [ -f ../contrib/gdb-add-index.sh ] > > + then > > + GDB_ADD_INDEX="../contrib/gdb-add-index.sh" > > + elif [ -f ../../contrib/gdb-add-index.sh ] > > + then > > + GDB_ADD_INDEX="../../contrib/gdb-add-index.sh" > > + else > > + echo "$myname: unable to find usable contrib/gdb-add-index.sh" >&2 > > + exit 1 > > + fi > > + fi > > +fi > > This strategy doesn't work for out of tree builds. I use it always with explicit $GDB_ADD_INDEX so this auto-detection does not really matter to me: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff;h=44099fb634eca7837d30ab9b6afde0ec2838f705 > Perhaps cooking up > something based on $0 would be better? I see that the GDB variable is > auto-detected the same way, but the gdb binary is found in the build > directory, so it works for the tests, whereas gdb-add-index.sh is in the > source directory. > > I think it would still be nice to improve how GDB is auto-detected (in > another patch), OK, I believe that is unrelated to this patchset. I am fine to always specify all the tools explicitly. > Is PIPESTATUS bash specific? If so, we should probably change the > interpreter to > > #!/usr/bin/env bash > > The CC/CXX_FOR_TARGET variables in cc-with-tweaks.exp also use /bin/sh > explicitly, I think it those can just be removed. Done. Thanks, Jan Hi, currently contrib/cc-with-tweaks.sh is calling for its -i option objcopy itself instead of using contrib/gdb-add-index.sh which does the same. With DWARF-5 .debug_names the commands are more complicated (as now also .debug_str needs to be modified) and so I have decided to rather reuse contrib/gdb-add-index.sh instead of duplicating its code in contrib/cc-with-tweaks.sh. The problem is when no index is produced whether contrib/cc-with-tweaks.sh should fail or not. As originally contrib/cc-with-tweaks.sh was more quiet (=successful) than contrib/gdb-add-index.sh and so after this patch the testsuite runs with an index would "regress". I have tried to keep the behavior unchanged. Some cases still error with: Ada is not currently supported by the index But some cases (such as some trivial gdb.dwarf2/ testcases with no DWARF data to index) produce no index while the testcases still PASS now instead of: -PASS: gdb.arch/i386-bp_permanent.exp: stack pointer value matches +gdb compile failed, gdb-add-index.sh: No index was created for /quadgdb/testsuite.unix.-m64/outputs/gdb.arch/i386-bp_permanent/i386-bp_permanent +gdb-add-index.sh: [Was there no debuginfo? Was there already an index?] +UNTESTED: gdb.arch/i386-bp_permanent.exp: failed to compile Jan gdb/ChangeLog 2017-05-26 Jan Kratochvil * contrib/cc-with-tweaks.sh: Change interpreter to bash, incl. initial comment. (t, GDB_ADD_INDEX): New variables. <$want_index>: Call $GDB_ADD_INDEX. --- gdb/contrib/cc-with-tweaks.sh | 47 +++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/gdb/contrib/cc-with-tweaks.sh b/gdb/contrib/cc-with-tweaks.sh index 7d39c00..ae52e1d 100755 --- a/gdb/contrib/cc-with-tweaks.sh +++ b/gdb/contrib/cc-with-tweaks.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/usr/bin/env bash # Wrapper around gcc to tweak the output in various ways when running # the testsuite. @@ -27,8 +27,8 @@ # # bash$ cd $objdir/gdb/testsuite # bash$ runtest \ -# CC_FOR_TARGET="/bin/sh $srcdir/gdb/contrib/cc-with-tweaks.sh ARGS gcc" \ -# CXX_FOR_TARGET="/bin/sh $srcdir/gdb/contrib/cc-with-tweaks.sh ARGS g++" +# CC_FOR_TARGET="/bin/bash $srcdir/gdb/contrib/cc-with-tweaks.sh ARGS gcc" \ +# CXX_FOR_TARGET="/bin/bash $srcdir/gdb/contrib/cc-with-tweaks.sh ARGS g++" # # For documentation on Fission and dwp files: # http://gcc.gnu.org/wiki/DebugFission @@ -74,6 +74,8 @@ DWP=${DWP:-dwp} have_link=unknown next_is_output_file=no output_file=a.out +t=/tmp/cc-with-tweaks.$$ +rm -f $t want_index=false want_dwz=false @@ -93,6 +95,26 @@ while [ $# -gt 0 ]; do shift done +if [ "$want_index" = true ] +then + if [ -z "$GDB_ADD_INDEX" ] + then + if [ -f ./contrib/gdb-add-index.sh ] + then + GDB_ADD_INDEX="./contrib/gdb-add-index.sh" + elif [ -f ../contrib/gdb-add-index.sh ] + then + GDB_ADD_INDEX="../contrib/gdb-add-index.sh" + elif [ -f ../../contrib/gdb-add-index.sh ] + then + GDB_ADD_INDEX="../../contrib/gdb-add-index.sh" + else + echo "$myname: unable to find usable contrib/gdb-add-index.sh" >&2 + exit 1 + fi + fi +fi + for arg in "$@" do if [ "$next_is_output_file" = "yes" ] @@ -152,20 +174,11 @@ if [ "$want_objcopy_compress" = true ]; then fi if [ "$want_index" = true ]; then - $GDB --batch-silent -nx -ex "set auto-load no" -ex "file $output_file" -ex "save gdb-index $output_dir" - rc=$? - [ $rc != 0 ] && exit $rc - - # GDB might not always create an index. Cope. - if [ -f "$index_file" ] - then - $OBJCOPY --add-section .gdb_index="$index_file" \ - --set-section-flags .gdb_index=readonly \ - "$output_file" "$output_file" - rc=$? - else - rc=0 - fi + # Filter out these messages which would stop dejagnu testcase run: + # echo "$myname: No index was created for $file" 1>&2 + # echo "$myname: [Was there no debuginfo? Was there already an index?]" 1>&2 + GDB=$GDB $GDB_ADD_INDEX "$output_file" 2>&1|grep -v "^${GDB_ADD_INDEX##*/}: " >&2 + rc=${PIPESTATUS[0]} [ $rc != 0 ] && exit $rc fi