From patchwork Sat Mar 24 14:09:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 890438 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-91234-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=intel.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="jkXVFLv8"; 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 407j2v6ts2z9s1B for ; Sun, 25 Mar 2018 01:09:43 +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:date:from:to:subject:message-id:reply-to :mime-version:content-type; q=dns; s=default; b=bKlAZxtIW3+y7gti fCTNZ1drN4buNgBRcv2AE5rKdx1ckWWRZ89rQ0jemUTita7dN64z8/atzQfa4wI7 em6xs+GxEBgdfav9J7ys8mtpXvXTz8lZB8Xey6i7+lt0OhH9yOMkArQlm6oTeRLR tdMtQ2PPzK2KEa4FmtMoMeqZamk= 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:date:from:to:subject:message-id:reply-to :mime-version:content-type; s=default; bh=QgLGBMG93DDzkdqBal+BGh v7eXo=; b=jkXVFLv8yxut7AscrY7WMN6iThHH/dsYaE2V5Kmmm3SAsppvLvM+NI 79YYAEoufvQNhbAqmZ4+8/BPqRIuy9ik0VX21tkYku0QsHFxCbdF0eDUN7LrFf3e KONX/xxGhG5x0gRdTCABrJ7kyy2wQrkelhJTRWDIQg2g0SVBHcs+E= Received: (qmail 88531 invoked by alias); 24 Mar 2018 14:09:37 -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 88118 invoked by uid 89); 24 Mar 2018 14:09:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, NO_DNS_FOR_FROM, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Hx-languages-length:1331 X-HELO: mga11.intel.com X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False X-ExtLoop1: 1 Date: Sat, 24 Mar 2018 07:09:09 -0700 From: "H.J. Lu" To: GNU C Library Subject: [PATCH] Add $(tests-execstack-$(have-z-execstack)) after defined [BZ #22998] Message-ID: <20180324140909.GA36469@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.2 (2017-12-15) When $(tests-execstack-$(have-z-execstack)) is added to tests before it is defined, it is empty. This patch adds it to tests after it is defined. OK for master? H.J. --- [BZ #22998] * elf/Makefile (tests): Add $(tests-execstack-$(have-z-execstack)) after it is defined. --- elf/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/elf/Makefile b/elf/Makefile index 9bdb9220c7..59bcca5046 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -174,7 +174,7 @@ tests += restest1 preloadtest loadfail multiload origtest resolvfail \ tst-tls4 tst-tls5 \ tst-tls10 tst-tls11 tst-tls12 tst-tls13 tst-tls14 tst-tls15 \ tst-tls16 tst-tls17 tst-tls18 tst-tls19 tst-tls-dlinfo \ - tst-align tst-align2 $(tests-execstack-$(have-z-execstack)) \ + tst-align tst-align2 \ tst-dlmodcount tst-dlopenrpath tst-deep1 \ tst-dlmopen1 tst-dlmopen3 \ unload3 unload4 unload5 unload6 unload7 unload8 tst-global1 order2 \ @@ -202,6 +202,7 @@ ifneq ($(selinux-enabled),1) tests-execstack-yes = tst-execstack tst-execstack-needed tst-execstack-prog endif endif +tests += $(tests-execstack-$(have-z-execstack)) ifeq ($(run-built-tests),yes) tests-special += $(objpfx)tst-leaks1-mem.out \ $(objpfx)tst-leaks1-static-mem.out $(objpfx)noload-mem.out \