From 53680b89fbbf392b7b1d7c67cbd47fdb8dbbf68c Mon Sep 17 00:00:00 2001 From: Packit Service Date: Feb 24 2021 15:21:52 +0000 Subject: Apply patch 0001-Honor-PYTHON-from-configure-when-running-tests.patch patch_name: 0001-Honor-PYTHON-from-configure-when-running-tests.patch present_in_specfile: true location_in_specfile: 40 --- diff --git a/tests/Makefile.am b/tests/Makefile.am index 7a6641d..571d23c 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 f4a8308..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=`python2 -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 a72baed..27573f8 100644 --- a/tests/local.at +++ b/tests/local.at @@ -18,7 +18,7 @@ def myprint(msg = ''): sys.stdout.write('%s\n' % msg) $1 EOF -python2 test.py +${PYTHON} test.py test.py ]]) m4_define([RPMPY_CHECK],[