[committed] Disable tst-dlopen-atout unless --enable-hardcoded-path-in-tests

Message ID ye6q7g6viuwg.fsf@elbrus2.mtv.corp.google.com
State Committed
Headers

Commit Message

Paul Pluzhnikov April 11, 2014, 6:27 p.m. UTC
  Greetings,

I've committed the patch below as obvious.

Tested on Linux/x86_64 with and without --enable-hardcoded-path-in-tests

Sorry about the breakage.
--

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

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

Patch

diff --git a/elf/Makefile b/elf/Makefile
index d96cd40..7ff3da2 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)