From patchwork Thu Dec 19 14:35:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 1213467 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-108227-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="pnRXeRuW"; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="bNNDhSXP"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47dvYZ0BzHz9sPc for ; Fri, 20 Dec 2019 01:35:29 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=ZfX Jt9dgBkxm+fYolkEMwopaelcNQ4KrhGQ5xn2U1yFdy96yWipGn+av3jQrYV3bfdh KcmAmNg1ABUwl5mIWBkQ4BMY4zLXonDk5nKrYNEwo1E9RjLXSq+RTcfQKf4KHOGi AEgRDvp0Ql0wAjjyffDACtf2fizj/2lCQigfqElU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=jlzAxvbIj rk0iijOTtv+gz1T5Ko=; b=pnRXeRuWPM2oo0DdXlvHEvDxhhVbJEXmc6fi9NDSA MPey19gvsodEmoRGcu7ejWs6oEHKQ/O6GR1rXgyfB9wLiFIiUn4hSXXrYVq2CzZ+ nQUEfV5JyvCc/MvW3NoiH+JK3YnRqGnX1e5EQEqSlZ3ZVNgp8M0Erq44AzjqdlrB n0= Received: (qmail 28474 invoked by alias); 19 Dec 2019 14:35:23 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 28441 invoked by uid 89); 19 Dec 2019 14:35:23 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-18.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: us-smtp-delivery-1.mimecast.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576766120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s+sCdHAJtSSQSOfQNhejBwvRiFtb9NRTuZeXgbvcwOA=; b=bNNDhSXPWopPauIR9VNArem/zM+AO3xmESz8I0P0WKgyWF3EZjn1bobtqcBm4Bb7hh6qZR f7DNg+aSMiyeqUEpjJg/CST/OSz3vQgFFaGOE4P1q0m9thVShJ2v+cUg9o44cNTFeToZ8o y3fWFBwVKApgfq4tH3ITd6TF9HDwIOk= From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH] Fix test isolation for elf/tst-ifunc-fault-lazy, elf/tst-ifunc-fault-bindnow Date: Thu, 19 Dec 2019 15:35:14 +0100 Message-ID: <87pngkwfh9.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 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. ----- elf/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/elf/Makefile b/elf/Makefile index 72a5aa88b1..2c52e8ae19 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1374,11 +1374,13 @@ $(objpfx)ifuncmain5picstatic: $(addprefix $(objpfx),ifuncdep5pic.o) LDFLAGS-tst-ifunc-fault-lazy = -Wl,-z,lazy LDFLAGS-tst-ifunc-fault-bindnow = -Wl,-z,now +tst-ifunc-fault-script-ldso = \ + $(objpfx)ld.so --library-path $(common-objpfx):$(objpfx) define tst-ifunc-fault-script -( $(objpfx)ld.so --verify --library-path $(objpfx) $^ \ - && LD_TRACE_LOADED_OBJECTS=1 $(objpfx)ld.so --library-path $(objpfx) $^ \ +( $(tst-ifunc-fault-script-ldso) --verify $^ \ + && LD_TRACE_LOADED_OBJECTS=1 $(tst-ifunc-fault-script-ldso) $^ \ && LD_TRACE_LOADED_OBJECTS=1 LD_DEBUG=unused \ - $(objpfx)ld.so --library-path $(objpfx) $^ \ + $(tst-ifunc-fault-script-ldso) $^ \ ) > $@; $(evaluate-test) endef $(objpfx)tst-ifunc-fault-lazy.out: $(objpfx)tst-ifunc-fault-lazy $(objpfx)ld.so