From: Ondřej Surý <ondrej@isc.org>
Date: Mon, 27 Apr 2020 10:23:44 +0000 (+0200)
Subject: Use absolute path to PYTHON and PERL, so test -x works properly in system tests
X-Git-Tag: v9.17.2~121^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=968523dd8dba4a64a8b4be19f26ea15481c89aeb;p=thirdparty%2Fbind9.git

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 dc9b73be7ce..85f8df69e4d 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 6aaf0bdf541..2d2c63e2856 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 d7d80a61348..a666b7e01ff 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