From e3be7d85f68240109ca72464c8bd468bea656e8b Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mar 25 2020 08:22:22 +0000 Subject: Honor PYTHON from configure when running tests Pass PYTHON from configure down through all the nutty layers of make to allow running test-suite with Python 3. In theory that is. (cherry picked from commit dcd5ab67c40b543f22b07df8c1028c34b94a7929) --- diff --git a/tests/Makefile.am b/tests/Makefile.am index e79f7e0..547416f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -117,6 +117,7 @@ atlocal: atlocal.in Makefile -e "s,[@]usrlibdir[@],$(libdir)," \ -e "s,[@]execprefix[@],$(exec_prefix)," \ -e "s,[@]RPMCONFIGDIR[@],$(rpmconfigdir)," \ + -e "s,[@]PYTHON[@],$(PYTHON)," \ < $(srcdir)/atlocal.in > atlocal DISTCLEANFILES = atlocal EXTRA_DIST += atlocal.in diff --git a/tests/atlocal.in b/tests/atlocal.in index d7d837f..3b1474b 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -3,7 +3,8 @@ export LD_LIBRARY_PATH PATH="${abs_builddir}/testing@rpmbindir@:${abs_builddir}/testing@usrbindir@:$PATH" export PATH -PYLIBDIR=`python -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1,0,'@execprefix@'))"` +PYTHON=@PYTHON@ +PYLIBDIR=$(${PYTHON} -c "from distutils.sysconfig import get_python_lib; import sys; sys.stdout.write(get_python_lib(1,0,'@execprefix@'))") PYTHONPATH="${abs_builddir}/testing${PYLIBDIR}" export PYTHONPATH diff --git a/tests/local.at b/tests/local.at index b0d290e..a6fd1ce 100644 --- a/tests/local.at +++ b/tests/local.at @@ -18,7 +18,7 @@ def myprint(msg = ''): sys.stdout.write('%s\n' % msg) $1 EOF -python test.py +${PYTHON} test.py ]]) m4_define([RPMPY_CHECK],[