diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2016-03-08 04:53:24 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2016-03-08 04:53:38 -0800 |
| commit | 87da630b22f70355531a759099f7f4b9311fb39d (patch) | |
| tree | b9c9a45478c099b4383505b493b8a6851381ced2 | |
| parent | 30bcdc1860a9e80afad11c94e508f962a6563205 (diff) | |
| download | glibc-87da630b22f70355531a759099f7f4b9311fb39d.tar.gz glibc-87da630b22f70355531a759099f7f4b9311fb39d.tar.xz glibc-87da630b22f70355531a759099f7f4b9311fb39d.zip | |
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).
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | benchtests/Makefile | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 2a7abbc8a6..289d578c77 100644 --- 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 2b553f8355..a37d6666ec 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 \ |