From 67fc563718f00c690b5be579f7282ee60d7db749 Mon Sep 17 00:00:00 2001 From: Carlos O'Donell Date: Wed, 13 Jan 2016 11:00:57 -0500 Subject: Use $(PYTHON) to run benchtests python files. --- ChangeLog | 6 ++++++ benchtests/Makefile | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 025db2bbce..2c261caf22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-01-13 Carlos O'Donell + + * benchtests/Makefile (PYTHON): Define. + (bench-func): Use $(PYTHON) to run python scripts. + ($(objpfx)bench-%.c): Likewise. + 2016-01-13 Flavio Cruz * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Do not remove diff --git a/benchtests/Makefile b/benchtests/Makefile index 674d313b34..2b553f8355 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -15,10 +15,11 @@ # License along with the GNU C Library; if not, see # . - # Makefile for benchmark tests. The only useful target here is `bench`. # Add benchmark functions in alphabetical order. +PYTHON := python + subdir := benchtests include ../Makeconfig @@ -164,7 +165,7 @@ bench-func: $(binaries-bench) mv -f $(objpfx)bench.out $(objpfx)bench.out.old; \ fi; \ mv -f $(objpfx)bench.out-tmp $(objpfx)bench.out - scripts/validate_benchout.py $(objpfx)bench.out \ + $(PYTHON) scripts/validate_benchout.py $(objpfx)bench.out \ scripts/benchout.schema.json $(timing-type) $(binaries-bench) $(binaries-benchset) \ @@ -177,5 +178,5 @@ $(objpfx)bench-%.c: %-inputs $(bench-deps) { if [ -n "$($*-INCLUDE)" ]; then \ cat $($*-INCLUDE); \ fi; \ - scripts/bench.py $(patsubst %-inputs,%,$<); } > $@-tmp + $(PYTHON) scripts/bench.py $(patsubst %-inputs,%,$<); } > $@-tmp mv -f $@-tmp $@ -- cgit 1.4.1