upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-07-16 20:02:49 -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)

conf.sh.win32 was modified in addition of the above mentioned commit.
This commit is contained in:
Tom Krizek 2022-11-16 14:37:01 +01:00
parent 4b32c5608a
commit 2b93b47c32
No known key found for this signature in database
GPG key ID: 01623B9B652A20A7
2 changed files with 47 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,6 +77,36 @@ export KRB5_CONFIG=/dev/null
# use local keytab instead of default /etc/krb5.keytab
export KRB5_KTNAME=dns.keytab
# Things that are different on Windows
export KILL=kill
export DIFF=diff
export DOS2UNIX=true
# There's no trailing period on Windows
export TP=.
# Programs detected by configure
# Variables will be empty if no program was found by configure
export SHELL=@SHELL@
export CURL=@CURL@
export XMLLINT=@XMLLINT@
export XSLTPROC=@XSLTPROC@
export PYTEST=@PYTEST@
# Windows process management leave empty
export PSSUSPEND=
#
# Interpreters for system tests detected by configure
#
export PERL=@PERL@
export PYTHON=@PYTHON@
#
# 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
@ -90,37 +120,3 @@ 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
export DOS2UNIX=true
# There's no trailing period on Windows
export TP=.
# 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@
# 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@
# Windows process management leave empty
export PSSUSPEND=
export PYTHON=@PYTHON@
export PYTEST=@PYTEST@
#
# Determine if we support various optional features.
#
export CRYPTO=@CRYPTO@

34
bin/tests/system/conf.sh.win32
View file

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