diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in index d6c76ea6f1..a6999e39b2 100644 --- a/bin/tests/system/conf.sh.in +++ b/bin/tests/system/conf.sh.in @@ -66,13 +66,29 @@ export KRB5_CONFIG=/dev/null # use local keytab instead of default /etc/krb5.keytab export KRB5_KTNAME=dns.keytab +# +# Programs detected by configure +# Variables will be empty if no program was found by configure +# +export SHELL=@SHELL@ +export CURL=@CURL@ +export NC=@NC@ +export XMLLINT=@XMLLINT@ +export XSLTPROC=@XSLTPROC@ +export PYTEST=@PYTEST@ + +# +# Interpreters for system tests detected by configure +# +export PERL=$(command -v "@PERL@") +export PYTHON=$(command -v "@PYTHON@" || true) + # Load common values . $TOP_SRCDIR/bin/tests/system/conf.sh.common # # Construct the lists of tests to run # - PARALLEL_UNIX="chain checkds cookie @@ -92,24 +108,3 @@ qmin shutdown tcp" SUBDIRS="$PARALLEL_COMMON $PARALLEL_UNIX" - -# Use the CONFIG_SHELL detected by configure for tests -export SHELL=@SHELL@ - -# CURL will be empty if no program was found by configure -export CURL=@CURL@ - -# NC will be empty if no program was found by configure -export NC=@NC@ - -# XMLLINT will be empty if no program was found by configure -export XMLLINT=@XMLLINT@ - -# XSLTPROC will be empty if no program was found by configure -export XSLTPROC=@XSLTPROC@ - -# PERL will be an empty string if no perl interpreter was found. -export PERL=$(command -v "@PERL@") - -export PYTHON=$(command -v "@PYTHON@" || true) -export PYTEST=@PYTEST@