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

login
register
mail settings
Submitter H.J. Lu
Date March 7, 2016, 8:37 p.m.
Message ID <20160307203723.GA31687@intel.com>
Download mbox | patch
Permalink /patch/11245/
State New
Headers show

Comments

H.J. Lu - March 7, 2016, 8:37 p.m.
benchtests should use $(test-via-rtld-prefix) and $(+link-tests) like
other glibc tests.

OK for master?

H.J.
---
	[BZ #19783]
	* benchtests/Makefile (run-bench): Replace $(rtld-prefix) with
	$(test-via-rtld-prefix).
	($(binaries-bench)): Replace $(+link) with $(+link-tests).
---
 benchtests/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Siddhesh Poyarekar - March 8, 2016, 5:54 a.m.
On Mon, Mar 07, 2016 at 12:37:23PM -0800, H.J. Lu wrote:
> benchtests should use $(test-via-rtld-prefix) and $(+link-tests) like
> other glibc tests.
> 
> OK for master?

Yes.

Thanks,
Siddhesh

Patch

diff --git a/benchtests/Makefile b/benchtests/Makefile
index 2b553f8..a37d666 100644
--- 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 \