diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index dc9b73be7c..85f8df69e4 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -106,12 +106,12 @@ XMLLINT=@XMLLINT@ XSLTPROC=@XSLTPROC@ # PERL will be an empty string if no perl interpreter was found. -PERL=@PERL@ +PERL=$(command -v "@PERL@") # Windows process management leave empty PSSUSPEND= -PYTHON=@PYTHON@ +PYTHON=$(command -v "@PYTHON@") # # Determine if we support various optional features. diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh index 6aaf0bdf54..2d2c63e285 100644 --- a/bin/tests/system/digdelv/tests.sh +++ b/bin/tests/system/digdelv/tests.sh @@ -62,7 +62,7 @@ KEYDATA="$(< ns2/keydata sed -e 's/+/[+]/g')" NOSPLIT="$(< ns2/keydata sed -e 's/+/[+]/g' -e 's/ //g')" HAS_PYYAML=0 -if [ -n "$PYTHON" ] ; then +if [ -x "$PYTHON" ] ; then $PYTHON -c "import yaml" 2> /dev/null && HAS_PYYAML=1 fi diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh index d7d80a6134..a666b7e01f 100644 --- a/bin/tests/system/dnstap/tests.sh +++ b/bin/tests/system/dnstap/tests.sh @@ -499,7 +499,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` HAS_PYYAML=0 -if [ -n "$PYTHON" ] ; then +if [ -x "$PYTHON" ] ; then $PYTHON -c "import yaml" 2> /dev/null && HAS_PYYAML=1 fi