Use $(PYTHON) to run benchtests python files.

This commit is contained in:
Carlos O'Donell 2016-01-13 11:00:57 -05:00
parent e42ce0f45e
commit 67fc563718
2 changed files with 10 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2016-01-13 Carlos O'Donell <carlos@redhat.com>
* benchtests/Makefile (PYTHON): Define.
(bench-func): Use $(PYTHON) to run python scripts.
($(objpfx)bench-%.c): Likewise.
2016-01-13 Flavio Cruz <flaviocruz@gmail.com> 2016-01-13 Flavio Cruz <flaviocruz@gmail.com>
* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Do not remove * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Do not remove

View File

@ -15,10 +15,11 @@
# License along with the GNU C Library; if not, see # License along with the GNU C Library; if not, see
# <http://www.gnu.org/licenses/>. # <http://www.gnu.org/licenses/>.
# Makefile for benchmark tests. The only useful target here is `bench`. # Makefile for benchmark tests. The only useful target here is `bench`.
# Add benchmark functions in alphabetical order. # Add benchmark functions in alphabetical order.
PYTHON := python
subdir := benchtests subdir := benchtests
include ../Makeconfig include ../Makeconfig
@ -164,7 +165,7 @@ bench-func: $(binaries-bench)
mv -f $(objpfx)bench.out $(objpfx)bench.out.old; \ mv -f $(objpfx)bench.out $(objpfx)bench.out.old; \
fi; \ fi; \
mv -f $(objpfx)bench.out-tmp $(objpfx)bench.out 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 scripts/benchout.schema.json
$(timing-type) $(binaries-bench) $(binaries-benchset) \ $(timing-type) $(binaries-bench) $(binaries-benchset) \
@ -177,5 +178,5 @@ $(objpfx)bench-%.c: %-inputs $(bench-deps)
{ if [ -n "$($*-INCLUDE)" ]; then \ { if [ -n "$($*-INCLUDE)" ]; then \
cat $($*-INCLUDE); \ cat $($*-INCLUDE); \
fi; \ fi; \
scripts/bench.py $(patsubst %-inputs,%,$<); } > $@-tmp $(PYTHON) scripts/bench.py $(patsubst %-inputs,%,$<); } > $@-tmp
mv -f $@-tmp $@ mv -f $@-tmp $@