diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | elf/Makefile | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 5a9db7822d..79d3dbf2a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-04-11 Paul Pluzhnikov <ppluzhnikov@google.com> + + * elf/Makefile (tests): make tst-dlopen-atout conditional on + enable-hardcoded-path-in-tests + 2014-04-11 Will Newton <will.newton@linaro.org> * benchtests/Makefile (extra-objs): Add json-lib.o. diff --git a/elf/Makefile b/elf/Makefile index d96cd40743..7ff3da2dfb 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -148,8 +148,11 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ tst-stackguard1 tst-addr1 tst-thrlock \ tst-unique1 tst-unique2 tst-unique3 tst-unique4 \ tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \ - tst-ptrguard1 tst-dlopen-aout + tst-ptrguard1 # reldep9 +ifeq ($(build-hardcoded-path-in-tests),yes) +tests += tst-dlopen-aout +endif test-srcs = tst-pathopt selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null) ifneq ($(selinux-enabled),1) |