Support --enable-hardcoded-path-in-tests in benchtests

benchtests should use $(test-via-rtld-prefix) and $(+link-tests) like
other glibc tests.

	[BZ #19783]
	* benchtests/Makefile (run-bench): Replace $(rtld-prefix) with
	$(test-via-rtld-prefix).
	($(binaries-bench)): Replace $(+link) with $(+link-tests).

diff --git a/ChangeLog b/ChangeLog
index 2a7abbc8a6494651a1a757365f7ee9c23f9cc4d0..289d578c778ed6f8e1d2b28693061dff27a2d788 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-03-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #19783]
+       * benchtests/Makefile (run-bench): Replace $(rtld-prefix) with
+       $(test-via-rtld-prefix).
+       ($(binaries-bench)): Replace $(+link) with $(+link-tests).
+
 2016-03-08  Florian Weimer  <fweimer@redhat.com>
 
        * sunrpc/key_call.c (key_call_keyenvoy): Use int status instead of

diff --git a/benchtests/Makefile b/benchtests/Makefile
index 2b553f835542bc12659e996ed34ebf30c051e88f..a37d6666ecf0813fdcc34bfcc5a3941898a94ec4 100644 (file)
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -118,7 +118,7 @@ bench-deps := bench-skeleton.c bench-timing.h Makefile
 
 run-bench = $(test-wrapper-env) \
            $(run-program-env) \
-           $($*-ENV) $(rtld-prefix) $${run}
+           $($*-ENV) $(test-via-rtld-prefix) $${run}
 
 timing-type := $(objpfx)bench-timing-type
 
@@ -172,7 +172,7 @@ $(timing-type) $(binaries-bench) $(binaries-benchset) \
        $(binaries-bench-malloc): %: %.o $(objpfx)json-lib.o \
   $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
   $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
-       $(+link)
+       $(+link-tests)
 
 $(objpfx)bench-%.c: %-inputs $(bench-deps)
        { if [ -n "$($*-INCLUDE)" ]; then \