ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Ensure test interpreters are defined before common config

Browse Source 
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).
This commit is contained in:
Tom Krizek
2022-11-07 16:38:49 +01:00
parent ba35a6df9c
commit 492992dca8
1 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
bin/tests/system/conf.sh.in
View File

@@ -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@