2014-04-11 Paul Pluzhnikov <ppluzhnikov@google.com>

	* elf/Makefile (tests): make tst-dlopen-aout conditional on
	enable-hardcoded-path-in-tests

diff --git a/ChangeLog b/ChangeLog
index 5a9db78..79d3dbf 100644 (file)
--- 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 d96cd40..7ff3da2 100644 (file)
--- 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)