From: Carlos O'Donell <carlos@systemhalted.org>
Date: Wed, 13 Jan 2016 16:00:57 +0000 (-0500)
Subject: Use $(PYTHON) to run benchtests python files.
X-Git-Tag: glibc-2.23~62
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67fc563718f00c690b5be579f7282ee60d7db749;p=thirdparty%2Fglibc.git

Use $(PYTHON) to run benchtests python files.
---

diff --git a/ChangeLog b/ChangeLog
index 025db2bbcee..2c261caf22f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Do not remove
diff --git a/benchtests/Makefile b/benchtests/Makefile
index 674d313b340..2b553f83554 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -15,10 +15,11 @@
 # License along with the GNU C Library; if not, see
 # <http://www.gnu.org/licenses/>.
 
-
 # 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 $@