[Xen-changelog] [xen-unstable] Make python check scripts use of $(PYTHON) make variable.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1247155507 -3600
# Node ID 7b8f6416aae4387ec70155777b380ae0b19b53ea
# Parent  813e362f333b459ffd378d94897ad658bbdc7235
Make python check scripts use of $(PYTHON) make variable.

Signed-off-by: Christoph Egger <Christoph.Egger@xxxxxxx>
---
 tools/check/Makefile           |    4 ++--
 tools/check/check_python       |    6 +++++-
 tools/check/check_python_devel |    7 ++++++-
 tools/check/check_python_xml   |    7 ++++++-
 4 files changed, 19 insertions(+), 5 deletions(-)

diff -r 813e362f333b -r 7b8f6416aae4 tools/check/Makefile
--- a/tools/check/Makefile      Thu Jul 09 16:06:52 2009 +0100
+++ b/tools/check/Makefile      Thu Jul 09 17:05:07 2009 +0100
@@ -7,12 +7,12 @@ all install: check-build
 # Check this machine is OK for building on.
 .PHONY: check-build
 check-build:
-       LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) 
./chk build
+       PYTHON=$(PYTHON) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) 
ACM_SECURITY=$(ACM_SECURITY) ./chk build
 
 # Check this machine is OK for installing on.
 .PHONY: check-install
 check-install:
-       LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) ACM_SECURITY=$(ACM_SECURITY) 
./chk install
+       PYTHON=$(PYTHON) LIBXENAPI_BINDINGS=$(LIBXENAPI_BINDINGS) 
ACM_SECURITY=$(ACM_SECURITY) ./chk install
 
 .PHONY: clean
 clean:
diff -r 813e362f333b -r 7b8f6416aae4 tools/check/check_python
--- a/tools/check/check_python  Thu Jul 09 16:06:52 2009 +0100
+++ b/tools/check/check_python  Thu Jul 09 17:05:07 2009 +0100
@@ -3,7 +3,11 @@
 
 . ./funcs.sh
 
-python -c '
+if test -z ${PYTHON}; then
+       PYTHON=`/usr/bin/env python 2>/dev/null`
+fi
+
+${PYTHON} -c '
 import sys
 sys.exit(sys.version_info[0] < 2 or sys.version_info[1] < 2)
 ' || fail "need python version >= 2.2"
diff -r 813e362f333b -r 7b8f6416aae4 tools/check/check_python_devel
--- a/tools/check/check_python_devel    Thu Jul 09 16:06:52 2009 +0100
+++ b/tools/check/check_python_devel    Thu Jul 09 17:05:07 2009 +0100
@@ -3,7 +3,12 @@
 
 . ./funcs.sh
 
-python -c '
+if test -z ${PYTHON}; then
+       PYTHON=`/usr/bin/env python 2>/dev/null`
+fi
+has_or_fail ${PYTHON}
+
+${PYTHON} -c '
 import os.path, sys
 for p in sys.path:
        if os.path.exists(p + "/config/Makefile"):
diff -r 813e362f333b -r 7b8f6416aae4 tools/check/check_python_xml
--- a/tools/check/check_python_xml      Thu Jul 09 16:06:52 2009 +0100
+++ b/tools/check/check_python_xml      Thu Jul 09 17:05:07 2009 +0100
@@ -3,5 +3,10 @@
 
 . ./funcs.sh
 
-python -c 'import xml.dom.minidom' 2>/dev/null || \
+if test -z ${PYTHON}; then
+       PYTHON=`/usr/bin/env python 2>/dev/null`
+fi
+has_or_fail ${PYTHON}
+
+${PYTHON} -c 'import xml.dom.minidom' 2>/dev/null || \
 fail "can't import xml.dom.minidom"

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog