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)

conf.sh.win32 was modified in addition of the above mentioned commit.

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 644e9a45f4671925d42463461b05e2123a354925..05fabaaef98ee485baaeb5c5638235fc65a7e526 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -77,21 +77,6 @@ export KRB5_CONFIG=/dev/null
 # use local keytab instead of default /etc/krb5.keytab
 export KRB5_KTNAME=dns.keytab
 
-# Load common values shared between windows and unix/linux.
-. $TOP/bin/tests/system/conf.sh.common
-
-#
-# Construct the lists of tests to run
-#
-SEQUENTIAL_UNIX="@PKCS11_TEST@"
-SEQUENTIALDIRS="$SEQUENTIAL_COMMON $SEQUENTIAL_UNIX"
-
-PARALLEL_UNIX="@CHECKDS@ @COVERAGE@ @DNSTAP@ @KEYMGR@ cookie logfileconfig"
-PARALLELDIRS="$PARALLEL_COMMON $PARALLEL_UNIX"
-
-SUBDIRS="$SEQUENTIALDIRS $PARALLELDIRS"
-
-
 # Things that are different on Windows
 export KILL=kill
 export DIFF=diff
@@ -99,28 +84,39 @@ export DOS2UNIX=true
 # There's no trailing period on Windows
 export TP=.
 
-# Use the CONFIG_SHELL detected by configure for tests
+# Programs detected by configure
+# Variables will be empty if no program was found by configure
 export SHELL=@SHELL@
-
-# CURL will be empty if no program was found by configure
 export CURL=@CURL@
-
-# 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=@PERL@
+export PYTEST=@PYTEST@
 
 # Windows process management leave empty
 export PSSUSPEND=
 
+#
+# Interpreters for system tests detected by configure
+#
+export PERL=@PERL@
 export PYTHON=@PYTHON@
-export PYTEST=@PYTEST@
 
 #
 # Determine if we support various optional features.
 #
 export CRYPTO=@CRYPTO@
+
+
+# Load common values shared between windows and unix/linux.
+. $TOP/bin/tests/system/conf.sh.common
+
+#
+# Construct the lists of tests to run
+#
+SEQUENTIAL_UNIX="@PKCS11_TEST@"
+SEQUENTIALDIRS="$SEQUENTIAL_COMMON $SEQUENTIAL_UNIX"
+
+PARALLEL_UNIX="@CHECKDS@ @COVERAGE@ @DNSTAP@ @KEYMGR@ cookie logfileconfig"
+PARALLELDIRS="$PARALLEL_COMMON $PARALLEL_UNIX"
+
+SUBDIRS="$SEQUENTIALDIRS $PARALLELDIRS"

diff --git a/bin/tests/system/conf.sh.win32 b/bin/tests/system/conf.sh.win32
index ed565990dccea0bdcafcb63cd0daa9bfb6331214..c9a9612a8ff123f03c237a072e4ed84498dab697 100644 (file)
--- a/bin/tests/system/conf.sh.win32
+++ b/bin/tests/system/conf.sh.win32
@@ -27,12 +27,14 @@ export TOP_SRCDIR="$TOP"
 # and changes some specific behaviors where necessary.
 export CYGWIN=1
 
-# Load common values shared between windows and unix/linux.
-. $TOP/bin/tests/system/conf.sh.common
-
 # Visual Studio build configurations are Release and Debug
 export VSCONF=${VSCONF:-Debug}
 
+# Interpreters for system tests
+export PERL=/usr/bin/perl
+export PYTHON=@PYTHON@
+
+
 export ARPANAME=$TOP/Build/$VSCONF/arpaname@EXEEXT@
 export CDS=$TOP/Build/$VSCONF/dnssec-cds@EXEEXT@
 export CHECKCONF=$TOP/Build/$VSCONF/named-checkconf@EXEEXT@
@@ -83,17 +85,6 @@ export RESOLVE=$TOP/Build/$VSCONF/resolve@EXEEXT@
 # we don't want a KRB5_CONFIG setting breaking the tests
 export KRB5_CONFIG=NUL
 
-#
-# Construct the lists of tests to run
-#
-SEQUENTIAL_WINDOWS=""
-SEQUENTIALDIRS="$SEQUENTIAL_COMMON $SEQUENTIAL_WINDOWS"
-
-PARALLEL_WINDOWS="@CHECKDS@ @COVERAGE@ @DNSTAP@ @KEYMGR@"
-PARALLELDIRS="$PARALLEL_COMMON $PARALLEL_WINDOWS"
-
-SUBDIRS="$SEQUENTIALDIRS $PARALLELDIRS"
-
 # Things that are different on Windows
 export KILL="/bin/kill -f"
 export DIFF="diff --strip-trailing-cr"
@@ -106,7 +97,6 @@ export TP=
 export SHELL="/bin/bash -o igncr"
 export CURL=/usr/bin/curl
 export XMLLINT=/usr/bin/xmllint
-export PERL=/usr/bin/perl
 
 #
 # PsSuspend is part of PSTools and can be downloaded from
@@ -114,12 +104,22 @@ export PERL=/usr/bin/perl
 #
 export PSSUSPEND=@PSSUSPEND@
 
-export PYTHON=@PYTHON@
-
 #
 # Determine if we support various optional features.
 #
 export CRYPTO=@CRYPTO@
 
+
 # The rest is shared between Windows and Unices
 . $TOP/bin/tests/system/conf.sh.common
+
+#
+# Construct the lists of tests to run
+#
+SEQUENTIAL_WINDOWS=""
+SEQUENTIALDIRS="$SEQUENTIAL_COMMON $SEQUENTIAL_WINDOWS"
+
+PARALLEL_WINDOWS="@CHECKDS@ @COVERAGE@ @DNSTAP@ @KEYMGR@"
+PARALLELDIRS="$PARALLEL_COMMON $PARALLEL_WINDOWS"
+
+SUBDIRS="$SEQUENTIALDIRS $PARALLELDIRS"