Detect Python interpreter instead of assuming "python"

This makes the extended test suite work one Debian(-ish) systems
without Python 2, where the Python 3 interpreter is called "python3".

Signed-off-by: Fiona Klute <fiona.klute@gmx.de>

diff --git a/configure.ac b/configure.ac
index f7766f38f205d1a5060c7975bff5353e6ce9fc1c..a46d85d07018b3e86320b73678161068e3ff14b8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -462,6 +462,9 @@ fi
 
 AM_CONDITIONAL(WANT_TEST_SUITE, test "$full_test_suite" = "yes")
 
+# parts of the extended test suite use Python
+AM_PATH_PYTHON(,, [:])
+
 AC_ARG_ENABLE(oldgnutls-interop,
   AS_HELP_STRING([--enable-oldgnutls-interop], [enable interoperability testing with old gnutls version]),
     enable_oldgnutls_interop=$enableval, enable_oldgnutls_interop=no)

diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index 025f513f78f529fb25f4a7d51e17cf3b7c0557f3..d6f6ff135bb932a56159d845aa8bd90d5ab4b789 100644 (file)
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -48,6 +48,7 @@ scripts_to_test = chain.sh \
 
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
        LC_ALL="C"                      \
+       PYTHON="$(PYTHON)"              \
        VALGRIND="$(VALGRIND)"          \
        top_builddir="$(top_builddir)"  \
        srcdir="$(srcdir)"              \

diff --git a/tests/suite/multi-ticket-reception.sh b/tests/suite/multi-ticket-reception.sh
index d84367703c1c3a1a8e3b382ce4da42092bc8bd68..6c0113e372d712c57d99a4414b0d15f9b2b251d8 100755 (executable)
--- a/tests/suite/multi-ticket-reception.sh
+++ b/tests/suite/multi-ticket-reception.sh
@@ -26,6 +26,10 @@ PYPATH="${srcdir}/tls-fuzzer/tlsfuzzer/"
 CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}"
 unset RETCODE
 
+if test "${PYTHON}" = ":" ; then
+       exit 77
+fi
+
 if ! test -x "${TLSPY_SERV}"; then
        exit 77
 fi
@@ -36,7 +40,7 @@ fi
 
 if test "${WINDIR}" != ""; then
        exit 77
-fi 
+fi
 
 if ! test -z "${VALGRIND}"; then
        VALGRIND="${LIBTOOL:-libtool} --mode=execute ${VALGRIND} --error-exitcode=15"
@@ -45,7 +49,7 @@ fi
 . "${srcdir}/../scripts/common.sh"
 
 KEY1=${srcdir}/tls-fuzzer/tlslite-ng/tests/serverX509Key.pem
-CERT1=${srcdir}/tls-fuzzer/tlsfuzzer/tests/serverX509Cert.pem 
+CERT1=${srcdir}/tls-fuzzer/tlsfuzzer/tests/serverX509Cert.pem
 
 #create links necessary for tlslite to function
 test -L "${srcdir}/tls-fuzzer/tlsfuzzer/ecdsa" || \
@@ -56,7 +60,7 @@ test -L "${srcdir}/tls-fuzzer/tlsfuzzer/tlslite" || \
 echo "Checking whether receiving 1 ticket succeeds (sanity)"
 
 eval "${GETPORT}"
-PYTHONPATH="${PYPATH}" ${TLSPY_SERV} server --tickets 1 -k ${KEY1} -c ${CERT1} 127.0.0.1:${PORT} &
+PYTHONPATH="${PYPATH}" "${PYTHON}" ${TLSPY_SERV} server --tickets 1 -k ${KEY1} -c ${CERT1} 127.0.0.1:${PORT} &
 PID=$!
 wait_server ${PID}
 
@@ -70,7 +74,7 @@ wait
 echo "Checking whether receiving 3 tickets in the same record succeeds"
 
 eval "${GETPORT}"
-PYTHONPATH="${PYPATH}" ${TLSPY_SERV} server --tickets 3 -k ${KEY1} -c ${CERT1} 127.0.0.1:${PORT} &
+PYTHONPATH="${PYPATH}" "${PYTHON}" ${TLSPY_SERV} server --tickets 3 -k ${KEY1} -c ${CERT1} 127.0.0.1:${PORT} &
 PID=$!
 wait_server ${PID}
 
@@ -84,7 +88,7 @@ wait
 echo "Checking whether receiving multiple tickets that span many records succeeds"
 
 eval "${GETPORT}"
-PYTHONPATH="${PYPATH}" ${TLSPY_SERV} server --tickets 1512 -k ${KEY1} -c ${CERT1} 127.0.0.1:${PORT} &
+PYTHONPATH="${PYPATH}" "${PYTHON}" ${TLSPY_SERV} server --tickets 1512 -k ${KEY1} -c ${CERT1} 127.0.0.1:${PORT} &
 PID=$!
 wait_server ${PID}
 

diff --git a/tests/suite/tls-fuzzer/tls-fuzzer-common.sh b/tests/suite/tls-fuzzer/tls-fuzzer-common.sh
index b41f068a07a91ba9141378b7986c003e880c8780..72ed56df19a212db22d3e48319d13252b3017c9e 100755 (executable)
--- a/tests/suite/tls-fuzzer/tls-fuzzer-common.sh
+++ b/tests/suite/tls-fuzzer/tls-fuzzer-common.sh
@@ -33,6 +33,10 @@ if ! test -d "${srcdir}/tls-fuzzer/tlsfuzzer" ; then
        exit 77
 fi
 
+if test "${PYTHON}" = ":" ; then
+       exit 77
+fi
+
 pushd "${srcdir}/tls-fuzzer/tlsfuzzer"
 
 test -L ecdsa || ln -s ../python-ecdsa/src/ecdsa ecdsa
@@ -44,7 +48,7 @@ retval=0
 
 tls_fuzzer_prepare
 
-PYTHONPATH=. python tests/scripts_retention.py ${TMPFILE} ${SERV} 821
+PYTHONPATH=. "${PYTHON}" tests/scripts_retention.py ${TMPFILE} ${SERV} 821
 retval=$?
 
 rm -f ${TMPFILE}