Use absolute path to PYTHON and PERL, so test -x works properly in system tests

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index dc9b73be7ced188fc120bc02516340e210a202f8..85f8df69e4d1a1e1cdf501d65dda1295743e7959 100644 (file)
--- 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 6aaf0bdf541b7ae6027fce15fc64b20d5fe3b80c..2d2c63e28562c85a3a0bba32a7738244fbe6fdc7 100644 (file)
--- 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 d7d80a61348976570c7a94d28735166246bc2e6b..a666b7e01ff6d058847fdbdae42cae180c6e2d85 100644 (file)
--- 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