upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

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).

(cherry picked from commit 492992dca8)
This commit is contained in:
Tom Krizek 2022-11-07 16:38:49 +01:00
parent 54a877ef47
commit 0079745f97
No known key found for this signature in database
GPG key ID: 01623B9B652A20A7
1 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
bin/tests/system/conf.sh.in
View file

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