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).
This commit is contained in:
H.J. Lu 2016-03-08 04:53:24 -08:00
parent 30bcdc1860
commit 87da630b22
2 changed files with 9 additions and 2 deletions

View File

@ -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

View File

@ -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 \