Ensure test interpreters are defined before common config

Nothing from conf.sh.common is required to set these values. On the
contrary, a Python interpreter needs to be set in order to randomize the
algorithm set (which happens in conf.sh.common).

(cherry picked from commit 492992dca8512e6cb2cd44c849656e9fa23b287d)

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 19d00991faec2cc30b3cb9bf2a0ad05504479919..8d4a55c21c58ccd38f3fdd4fd79b4938bb44ca80 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -67,6 +67,23 @@ 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
 
@@ -98,24 +115,3 @@ tcp"
 PARALLELDIRS="$PARALLEL_COMMON $PARALLEL_UNIX"
 
 SUBDIRS="$SEQUENTIALDIRS $PARALLELDIRS"
-
-# 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@