public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Florian Weimer <fw@sourceware.org>
To: glibc-cvs@sourceware.org
Subject: [glibc] Fix test isolation for elf/tst-ifunc-fault-lazy, elf/tst-ifunc-fault-bindnow
Date: Thu, 19 Dec 2019 15:45:00 -0000	[thread overview]
Message-ID: <20191219154541.47805.qmail@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6a265e577e8d7c9c950a793139df19b2d050ce5b

commit 6a265e577e8d7c9c950a793139df19b2d050ce5b
Author: Florian Weimer <fweimer@redhat.com>
Date:   Thu Dec 19 14:45:50 2019 +0100

    Fix test isolation for elf/tst-ifunc-fault-lazy, elf/tst-ifunc-fault-bindnow
    
    Previously, ld.so was invoked only with the elf subdirectory on the
    library search path.  Since the soname link for libc.so only exists in
    the top-level build directory, this leaked the system libc into the
    test.

Diff:
---
 elf/Makefile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/elf/Makefile b/elf/Makefile
index 72a5aa8..f861126 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -1375,10 +1375,9 @@ $(objpfx)ifuncmain5picstatic: $(addprefix $(objpfx),ifuncdep5pic.o)
 LDFLAGS-tst-ifunc-fault-lazy = -Wl,-z,lazy
 LDFLAGS-tst-ifunc-fault-bindnow = -Wl,-z,now
 define tst-ifunc-fault-script
-( $(objpfx)ld.so --verify --library-path  $(objpfx) $^ \
-  && LD_TRACE_LOADED_OBJECTS=1 $(objpfx)ld.so --library-path $(objpfx) $^ \
-  && LD_TRACE_LOADED_OBJECTS=1 LD_DEBUG=unused \
-    $(objpfx)ld.so --library-path  $(objpfx) $^ \
+( $(rtld-prefix) --verify $^ \
+  && LD_TRACE_LOADED_OBJECTS=1 $(rtld-prefix) $^ \
+  && LD_TRACE_LOADED_OBJECTS=1 LD_DEBUG=unused $(rtld-prefix) $^ \
 ) > $@; $(evaluate-test)
 endef
 $(objpfx)tst-ifunc-fault-lazy.out: $(objpfx)tst-ifunc-fault-lazy $(objpfx)ld.so


                 reply	other threads:[~2019-12-19 15:45 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20191219154541.47805.qmail@sourceware.org \
    --to=fw@sourceware.org \
    --cc=glibc-cvs@sourceware.org \
    /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).