From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 120242 invoked by alias); 23 Jul 2019 16:29:24 -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 120199 invoked by uid 9981); 23 Jul 2019 16:29:24 -0000 Date: Tue, 23 Jul 2019 16:29:00 -0000 Message-ID: <20190723162924.120197.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tulio Magno Quites Machado Filho To: glibc-cvs@sourceware.org Subject: [glibc] test-container: Avoid copying unintended system libraries X-Act-Checkin: glibc X-Git-Author: Tulio Magno Quites Machado Filho X-Git-Refname: refs/heads/master X-Git-Oldrev: dcf36bcad3f283f77893d3b157ef7bb2c99419f2 X-Git-Newrev: 95da14dac04b494149290d85bc5306226e30839e X-SW-Source: 2019-q3/txt/msg00114.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=95da14dac04b494149290d85bc5306226e30839e commit 95da14dac04b494149290d85bc5306226e30839e Author: Tulio Magno Quites Machado Filho Date: Mon Jul 22 16:30:45 2019 -0300 test-container: Avoid copying unintended system libraries Some DSOs are distributed in hardware capability directories, e.g. /usr/lib64/power7/libc.so.6 Whenever the processor is able to use one of these hardware-enabled DSOs, testroot.pristine ends up with copies of glibc-provided libraries from the system because it can't overwrite or remove them. This patch avoids the unintended copies by executing ld.so with the same arguments passed to each glibc test. * Makefile (testroot.pristine/install.stamp): Execute ld.so with the same arguments used in all tests. Diff: --- ChangeLog | 5 +++++ Makefile | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fc3ef3..8d4c898 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2019-07-23 Tulio Magno Quites Machado Filho + + * Makefile (testroot.pristine/install.stamp): Execute ld.so with + the same arguments used in all tests. + 2019-07-22 Szabolcs Nagy * NEWS: Mention the AArch64 IFUNC resolver ABI change. diff --git a/Makefile b/Makefile index dc5de7a..a4ed747 100644 --- a/Makefile +++ b/Makefile @@ -383,7 +383,7 @@ $(objpfx)testroot.pristine/install.stamp : ifeq ($(run-built-tests),yes) # Copy these DSOs first so we can overwrite them with our own. for dso in `$(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 \ - $(objpfx)elf/$(rtld-installed-name) \ + $(rtld-prefix) \ $(objpfx)testroot.pristine/bin/sh \ | grep / | sed 's/^[^/]*//' | sed 's/ .*//'` ;\ do \ @@ -392,7 +392,7 @@ ifeq ($(run-built-tests),yes) $(test-wrapper) cp $$dso $(objpfx)testroot.pristine$$dso ;\ done for dso in `$(test-wrapper-env) LD_TRACE_LOADED_OBJECTS=1 \ - $(objpfx)elf/$(rtld-installed-name) \ + $(rtld-prefix) \ $(objpfx)support/$(LINKS_DSO_PROGRAM) \ | grep / | sed 's/^[^/]*//' | sed 's/ .*//'` ;\ do \