From b8114edd3c9e789c36789f4ce5ca6deb41ea0a14 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Sat, 24 Mar 2018 08:25:43 -0700 Subject: Add $(tests-execstack-$(have-z-execstack)) after defined [BZ #22998] 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. [BZ #22998] * elf/Makefile (tests): Add $(tests-execstack-$(have-z-execstack)) after it is defined. --- ChangeLog | 6 ++++++ elf/Makefile | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index afdb766..94175ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-03-24 H.J. Lu + + [BZ #22998] + * elf/Makefile (tests): Add $(tests-execstack-$(have-z-execstack)) + after it is defined. + 2018-03-23 Andrew Senkevich Max Horn diff --git a/elf/Makefile b/elf/Makefile index 9bdb922..59bcca5 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 \ -- cgit v1.1