Skip to content

Commit

Permalink
Support --enable-hardcoded-path-in-tests in benchtests
Browse files Browse the repository at this point in the history
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).
  • Loading branch information
H.J. Lu committed Mar 8, 2016
1 parent 30bcdc1 commit 87da630
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions benchtests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit 87da630

Please sign in to comment.