public inbox for dwz@sourceware.org
 help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@redhat.com>
To: Mark Wielaard <mark@klomp.org>
Cc: dwz@sourceware.org, nickc@redhat.com
Subject: Re: [PATCH] Workaround binutils readelf following and printing alt file.
Date: Thu, 30 Jun 2022 14:15:02 +0200	[thread overview]
Message-ID: <Yr2Txlvpw3P8WChg@tucnak> (raw)
In-Reply-To: <20220630120959.14957-1-mark@klomp.org>

On Thu, Jun 30, 2022 at 02:09:59PM +0200, Mark Wielaard wrote:
> Even with -wN readelf 2.38-15.fc37 follows and prints the
> contents of the alt file. Workaround that by removing the
> alt file in tests when we are done with it. This should be
> fine even when binutils readelf gets fixed to not do that
> with -wN (but maybe this is by design?) This fixes the
> testsuite on Fedora rawhide.
> 
> 	* testsuite/dwz.tests/cycle.sh: Remove 3 (alt) file
> 	when done testing.
> 	* testsuite/dwz.tests/odr-struct-multifile.sh:
> 	Likewise.

LGTM>
> ---
> 
> https://code.wildebeest.org/git/user/mjw/dwz/commit/?h=readelf-binutils-alt
> 
>  testsuite/dwz.tests/cycle.sh                | 4 ++++
>  testsuite/dwz.tests/odr-struct-multifile.sh | 3 +++
>  2 files changed, 7 insertions(+)
>  mode change 100644 => 100755 testsuite/dwz.tests/odr-struct-multifile.sh
> 
> diff --git a/testsuite/dwz.tests/cycle.sh b/testsuite/dwz.tests/cycle.sh
> index 17f8eb5..ce42521 100644
> --- a/testsuite/dwz.tests/cycle.sh
> +++ b/testsuite/dwz.tests/cycle.sh
> @@ -26,6 +26,10 @@ $execs/dwz-for-test -m 3 1 2 --devel-no-checksum-cycle-opt --devel-ignore-size
>  cnt=$(readelf -wi 3 | grep -c "DW_AT_name.*: s$")
>  [ $cnt -eq 1 ]
>  
> +# Even with -wN readelf 2.38-15.fc37 follows and prints the contents
> +# of the alt file. So make sure it cannot do that by removing it.
> +rm 3
> +
>  cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*: s$" || true)
>  [ $cnt -eq 0 ]
>  
> diff --git a/testsuite/dwz.tests/odr-struct-multifile.sh b/testsuite/dwz.tests/odr-struct-multifile.sh
> old mode 100644
> new mode 100755
> index 159cbc3..5961abf
> --- a/testsuite/dwz.tests/odr-struct-multifile.sh
> +++ b/testsuite/dwz.tests/odr-struct-multifile.sh
> @@ -44,6 +44,9 @@ for name in member_one member_two member_three member_four; do
>      [ $cnt -eq 1 ]
>  done
>  
> +# Even with -wN readelf 2.38-15.fc37 follows and prints the contents
> +# of the alt file. So make sure it cannot do that by removing it.
> +rm 3
>  
>  for name in aaa bbb ccc; do
>      cnt=$(readelf -wi $readelf_flags 1 | grep -c "DW_AT_name.*:.*$name" || true)
> -- 
> 2.18.4

	Jakub


  reply	other threads:[~2022-06-30 12:15 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-30 12:09 Mark Wielaard
2022-06-30 12:15 ` Jakub Jelinek [this message]
2022-06-30 12:39 ` Nick Clifton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Yr2Txlvpw3P8WChg@tucnak \
    --to=jakub@redhat.com \
    --cc=dwz@sourceware.org \
    --cc=mark@klomp.org \
    --cc=nickc@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).