* python_test.sh: Use PYTHON variable to find python executable.

* python-yasm/tests/Makefile.inc: Pass PYTHON setting down through
TESTS_ENVIRONMENT.
* Makefile.am: Initialize TESTS_ENVIRONMENT to empty.

svn path=/trunk/yasm/; revision=1501

diff --git a/Makefile.am b/Makefile.am
index b87e65e54b374752912ae650621e6b21d13ae1e9..a2d9322fa313b0db64a12ccfe2a5f3a2767d902f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,6 +8,7 @@ AM_CFLAGS = @MORE_CFLAGS@
 bin_PROGRAMS =
 dist_man_MANS =
 TESTS =
+TESTS_ENVIRONMENT =
 noinst_PROGRAMS = genstring
 
 check_PROGRAMS = test_hd

diff --git a/tools/python-yasm/tests/Makefile.inc b/tools/python-yasm/tests/Makefile.inc
index 4286601d2429bd6d1120e14aae1cd214a987e135..19181b9fae3f045f3fcb17d4a83fdf7b073c006d 100644 (file)
--- a/tools/python-yasm/tests/Makefile.inc
+++ b/tools/python-yasm/tests/Makefile.inc
@@ -7,6 +7,7 @@ EXTRA_DIST += tools/python-yasm/tests/test_symrec.py
 
 if HAVE_PYTHON
 
+TESTS_ENVIRONMENT += PYTHON=${PYTHON}
 TESTS += tools/python-yasm/tests/python_test.sh
 
 endif

diff --git a/tools/python-yasm/tests/python_test.sh b/tools/python-yasm/tests/python_test.sh
index 9f39782cb156e58ddf16f248e27b0946518c151c..fbea44026b777e8117b7cce4dbe6be1d86fc7d1d 100755 (executable)
--- a/tools/python-yasm/tests/python_test.sh
+++ b/tools/python-yasm/tests/python_test.sh
@@ -12,6 +12,6 @@ elif [ "$1" = "--sanity" ]; then
     echo "Running static sanity checks."
     grep "except None:" ${srcdir}/tools/python-yasm/tests/*.py
 else
-    python -c "import sys; import glob; sys.path.insert(0, '${srcdir}/tools/python-yasm'); sys.path.insert(0, glob.glob('build/lib.*')[0]); import tests; raise SystemExit(tests.unit('$*'.split()))"
+    ${PYTHON} -c "import sys; import glob; sys.path.insert(0, '${srcdir}/tools/python-yasm'); sys.path.insert(0, glob.glob('build/lib.*')[0]); import tests; raise SystemExit(tests.unit('$*'.split()))"
 fi