From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 47856 invoked by alias); 19 Dec 2019 15:45:41 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 47806 invoked by uid 9299); 19 Dec 2019 15:45:41 -0000 Date: Thu, 19 Dec 2019 15:45:00 -0000 Message-ID: <20191219154541.47805.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc] Fix test isolation for elf/tst-ifunc-fault-lazy, elf/tst-ifunc-fault-bindnow X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/master X-Git-Oldrev: 1b132d55e2d3a4eb421c0f77f63b67b5022c22e3 X-Git-Newrev: 6a265e577e8d7c9c950a793139df19b2d050ce5b X-SW-Source: 2019-q4/txt/msg00628.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6a265e577e8d7c9c950a793139df19b2d050ce5b commit 6a265e577e8d7c9c950a793139df19b2d050ce5b Author: Florian Weimer 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