mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-25 03:27:18 +00:00
Code Issues Releases Wiki Activity

Drop $SYSTEMTESTTOP from bin/tests/system/

Browse Source 
The $SYSTEMTESTTOP shell variable if often set to .. in various shell
scripts inside bin/tests/system/, but most of the time it is only
used one line later, while sourcing conf.sh. This hardly improves
code readability.

$SYSTEMTESTTOP is also used for the purpose of referencing
scripts/files living in bin/tests/system/, but given that the
variable is always set to a short, relative path, we can drop it and
replace all of its occurrences with the relative path without adversely
affecting code readability.
This commit is contained in:
Michal Nowak 2020-07-21 12:12:59 +02:00
parent 6237be992f
commit 093af1c00a
No known key found for this signature in database
GPG Key ID: 24A3E8463AEE5E56
277 changed files with 346 additions and 356 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/tests/system/README
View File

@ -374,7 +374,7 @@ a run of the full test suite (e.g. the tests are started with "runall.sh").
3. Each script should start with the following lines: 3. Each script should start with the following lines:
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
"conf.sh" defines a series of environment variables together with functions "conf.sh" defines a series of environment variables together with functions
useful for the test scripts. (conf.sh.win32 is the Windows equivalent of this useful for the test scripts. (conf.sh.win32 is the Windows equivalent of this

2
bin/tests/system/acl/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$SHELL clean.sh $SHELL clean.sh
$SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/example.db $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/example.db

4
bin/tests/system/acl/tests.sh
View File

@ -9,10 +9,10 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}" DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
status=0 status=0
t=0 t=0

2
bin/tests/system/additional/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$SHELL clean.sh $SHELL clean.sh
copy_setports ns1/named1.conf.in ns1/named.conf copy_setports ns1/named1.conf.in ns1/named.conf

4
bin/tests/system/additional/tests.sh
View File

@ -9,10 +9,10 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="-p ${PORT}" DIGOPTS="-p ${PORT}"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
status=0 status=0
n=0 n=0

2
bin/tests/system/addzone/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
cp -f ns1/redirect.db.1 ns1/redirect.db cp -f ns1/redirect.db.1 ns1/redirect.db
cp -f ns2/redirect.db.1 ns2/redirect.db cp -f ns2/redirect.db.1 ns2/redirect.db

4
bin/tests/system/addzone/tests.sh
View File

@ -9,10 +9,10 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${PORT}" DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${PORT}"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
check_zonestatus() ( check_zonestatus() (
$RNDCCMD "10.53.0.$1" zonestatus -redirect > "zonestatus.out.ns$1.$n" && $RNDCCMD "10.53.0.$1" zonestatus -redirect > "zonestatus.out.ns$1.$n" &&

2
bin/tests/system/allow-query/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ../common/controls.conf.in ns2/controls.conf copy_setports ../common/controls.conf.in ns2/controls.conf
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf

2
bin/tests/system/allow-query/tests.sh
View File

@ -50,7 +50,7 @@
# and querying as necessary. # and querying as necessary.
# #
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${PORT}" DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${PORT}"

2
bin/tests/system/auth/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

2
bin/tests/system/auth/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="+tcp -p ${PORT}" DIGOPTS="+tcp -p ${PORT}"

2
bin/tests/system/autosign/ns1/keygen.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../../conf.sh
zone=. zone=.
zonefile=root.db zonefile=root.db

2
bin/tests/system/autosign/ns2/keygen.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../../conf.sh
# Have the child generate subdomain keys and pass DS sets to us. # Have the child generate subdomain keys and pass DS sets to us.
( cd ../ns3 && $SHELL keygen.sh ) ( cd ../ns3 && $SHELL keygen.sh )

2
bin/tests/system/autosign/ns3/keygen.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../../conf.sh
SYSTESTDIR=autosign SYSTESTDIR=autosign

2
bin/tests/system/autosign/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

4
bin/tests/system/autosign/tests.sh
View File

@ -9,13 +9,13 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=0 n=0
DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p ${PORT}" DIGOPTS="+tcp +noadd +nosea +nostat +nocmd +dnssec -p ${PORT}"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
# convert private-type records to readable form # convert private-type records to readable form
showprivate () { showprivate () {

2
bin/tests/system/builtin/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

4
bin/tests/system/builtin/tests.sh
View File

@ -7,10 +7,10 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="-p ${PORT}" DIGOPTS="-p ${PORT}"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
status=0 status=0
n=0 n=0

2
bin/tests/system/cacheclean/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

2
bin/tests/system/cacheclean/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=0 n=0

2
bin/tests/system/case/setup.sh
View File

@ -7,7 +7,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
cp -f ns1/dynamic.db.in ns1/dynamic.db cp -f ns1/dynamic.db.in ns1/dynamic.db
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf

2
bin/tests/system/case/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="+tcp +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}" DIGOPTS="+tcp +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"

2
bin/tests/system/catz/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$SHELL clean.sh $SHELL clean.sh

4
bin/tests/system/catz/tests.sh
View File

@ -12,14 +12,14 @@
set -e set -e
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
dig_with_opts() { dig_with_opts() {
"$DIG" -p "${PORT}" "$@" "$DIG" -p "${PORT}" "$@"
} }
rndccmd() ( rndccmd() (
"$RNDC" -c "$SYSTEMTESTTOP/common/rndc.conf" -p "${CONTROLPORT}" -s "$@" "$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@"
) )
_wait_for_message() ( _wait_for_message() (

2
bin/tests/system/cds/setup.sh
View File

@ -11,7 +11,7 @@
set -eu set -eu
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
touch empty touch empty

2
bin/tests/system/cds/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=0 n=0

2
bin/tests/system/chain/ns2/sign.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../../conf.sh
zone=example. zone=example.
zonefile=example.db zonefile=example.db

2
bin/tests/system/chain/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

4
bin/tests/system/chain/tests.sh
View File

@ -7,10 +7,10 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="-p ${PORT}" DIGOPTS="-p ${PORT}"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
sendcmd() { sendcmd() {
send 10.53.0.4 "${EXTRAPORT1}" send 10.53.0.4 "${EXTRAPORT1}"

2
bin/tests/system/checkconf/tests.sh
View File

@ -7,7 +7,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=0 n=0

2
bin/tests/system/checknames/setup.sh
View File

@ -7,7 +7,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$SHELL clean.sh $SHELL clean.sh

2
bin/tests/system/checknames/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=1 n=1

2
bin/tests/system/checkzone/setup.sh
View File

@ -7,7 +7,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
ln -s $CHECKZONE named-compilezone ln -s $CHECKZONE named-compilezone

2
bin/tests/system/checkzone/tests.sh
View File

@ -7,7 +7,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=1 n=1

5
bin/tests/system/cleanall.sh
View File

@ -13,8 +13,7 @@
# Clean up after system tests. # Clean up after system tests.
# #
SYSTEMTESTTOP=. . ./conf.sh
. $SYSTEMTESTTOP/conf.sh
find . -type f \( \ find . -type f \( \
@ -25,7 +24,7 @@ find . -type f \( \
status=0 status=0
rm -f $SYSTEMTESTTOP/random.data rm -f ../random.data
for d in $SUBDIRS for d in $SUBDIRS
do do

2
bin/tests/system/cleanpkcs11.sh
View File

@ -9,6 +9,6 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
[ -x "$TOP_BUILDDIR/bin/pkcs11/pkcs11-destroy" ] && $PK11DEL -w0 > /dev/null 2>&1 [ -x "$TOP_BUILDDIR/bin/pkcs11/pkcs11-destroy" ] && $PK11DEL -w0 > /dev/null 2>&1

2
bin/tests/system/cookie/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

4
bin/tests/system/cookie/tests.sh
View File

@ -9,10 +9,10 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="-p ${PORT}" DIGOPTS="-p ${PORT}"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
status=0 status=0
n=0 n=0

2
bin/tests/system/database/setup.sh
View File

@ -9,6 +9,6 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named1.conf.in ns1/named.conf copy_setports ns1/named1.conf.in ns1/named.conf

2
bin/tests/system/database/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=0 n=0

2
bin/tests/system/delzone/setup.sh
View File

@ -9,6 +9,6 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$SHELL clean.sh $SHELL clean.sh

2
bin/tests/system/delzone/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p 5300" DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p 5300"
status=0 status=0

2
bin/tests/system/dialup/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0

2
bin/tests/system/digdelv/ns2/sign.sh
View File

@ -10,7 +10,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
set -e set -e

2
bin/tests/system/digdelv/setup.sh
View File

@ -10,7 +10,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
set -e set -e

2
bin/tests/system/digdelv/tests.sh
View File

@ -10,7 +10,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
set -e set -e

2
bin/tests/system/dlz/prereq.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
if ! $FEATURETEST --with-dlz-filesystem; then if ! $FEATURETEST --with-dlz-filesystem; then
echo_i "DLZ filesystem driver not supported" echo_i "DLZ filesystem driver not supported"

2
bin/tests/system/dlz/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$SHELL clean.sh $SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf

2
bin/tests/system/dlz/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=0 n=0

2
bin/tests/system/dlzexternal/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$TSIGKEYGEN ddns-key.example.nil > ns1/ddns.key $TSIGKEYGEN ddns-key.example.nil > ns1/ddns.key

4
bin/tests/system/dlzexternal/tests.sh
View File

@ -9,13 +9,13 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=0 n=0
DIGOPTS="@10.53.0.1 -p ${PORT} +nocookie" DIGOPTS="@10.53.0.1 -p ${PORT} +nocookie"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
newtest() { newtest() {
n=`expr $n + 1` n=`expr $n + 1`

2
bin/tests/system/dns64/ns1/sign.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../../conf.sh
zone=signed zone=signed
infile=example.db infile=example.db

2
bin/tests/system/dns64/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

2
bin/tests/system/dns64/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=0 n=0

2
bin/tests/system/dnssec/ns1/sign.sh
View File

@ -10,7 +10,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
set -e set -e

2
bin/tests/system/dnssec/ns2/sign.sh
View File

@ -10,7 +10,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
set -e set -e

2
bin/tests/system/dnssec/ns3/sign.sh
View File

@ -10,7 +10,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
set -e set -e

2
bin/tests/system/dnssec/ns5/sign.sh
View File

@ -10,7 +10,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
set -e set -e

2
bin/tests/system/dnssec/ns6/sign.sh
View File

@ -10,7 +10,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
set -e set -e

2
bin/tests/system/dnssec/ns7/sign.sh
View File

@ -10,7 +10,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
set -e set -e

2
bin/tests/system/dnssec/setup.sh
View File

@ -10,7 +10,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
set -e set -e

6
bin/tests/system/dnssec/tests.sh
View File

@ -10,7 +10,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
# shellcheck source=conf.sh # shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
set -e set -e
@ -36,7 +36,7 @@ delv_with_opts() {
} }
rndccmd() { rndccmd() {
"$RNDC" -c "$SYSTEMTESTTOP/common/rndc.conf" -p "$CONTROLPORT" -s "$@" "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@"
} }
# TODO: Move loadkeys_on to conf.sh.common # TODO: Move loadkeys_on to conf.sh.common
@ -3806,7 +3806,7 @@ ret=0
dig_with_opts . dnskey +ednsopt=KEY-TAG:fffe +ednsopt=KEY-TAG:fffd @10.53.0.1 > dig.out.ns1.test$n || ret=1 dig_with_opts . dnskey +ednsopt=KEY-TAG:fffe +ednsopt=KEY-TAG:fffd @10.53.0.1 > dig.out.ns1.test$n || ret=1
grep "trust-anchor-telemetry './IN' from .* 65534" ns1/named.run > /dev/null || ret=1 grep "trust-anchor-telemetry './IN' from .* 65534" ns1/named.run > /dev/null || ret=1
grep "trust-anchor-telemetry './IN' from .* 65533" ns1/named.run > /dev/null && ret=1 grep "trust-anchor-telemetry './IN' from .* 65533" ns1/named.run > /dev/null && ret=1
$PERL $SYSTEMTESTTOP/stop.pl dnssec ns1 || ret=1 $PERL ../stop.pl dnssec ns1 || ret=1
nextpart ns1/named.run > /dev/null nextpart ns1/named.run > /dev/null
start_server --noclean --restart --port ${PORT} dnssec ns1 || ret=1 start_server --noclean --restart --port ${PORT} dnssec ns1 || ret=1
n=$(($n+1)) n=$(($n+1))

2
bin/tests/system/dnstap/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

2
bin/tests/system/dnstap/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="+short -p ${PORT}" DIGOPTS="+short -p ${PORT}"
RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../common/rndc.conf" RNDCCMD="$RNDC -p ${CONTROLPORT} -c ../common/rndc.conf"

2
bin/tests/system/dscp/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

2
bin/tests/system/dscp/tests.sh
View File

@ -7,7 +7,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="+tcp +noadd +nosea +nostat +noquest -p ${PORT}" DIGOPTS="+tcp +noadd +nosea +nostat +noquest -p ${PORT}"

2
bin/tests/system/dsdigest/ns1/sign.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../../conf.sh
zone=. zone=.
infile=root.db.in infile=root.db.in

2
bin/tests/system/dsdigest/ns2/sign.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../../conf.sh
zone1=good zone1=good
infile1=good.db.in infile1=good.db.in

2
bin/tests/system/dsdigest/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

2
bin/tests/system/dsdigest/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0

2
bin/tests/system/dupsigs/ns1/reset_keys.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
zone=signing.test zone=signing.test
rm -rf keys/signing.test rm -rf keys/signing.test

2
bin/tests/system/dupsigs/setup.sh
View File

@ -7,7 +7,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$SHELL clean.sh $SHELL clean.sh

2
bin/tests/system/dupsigs/tests.sh
View File

@ -7,7 +7,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
start=`date +%s` start=`date +%s`

2
bin/tests/system/dyndb/setup.sh
View File

@ -9,6 +9,6 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf

4
bin/tests/system/dyndb/tests.sh
View File

@ -9,13 +9,13 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=0 n=0
DIGOPTS="@10.53.0.1 -p ${PORT}" DIGOPTS="@10.53.0.1 -p ${PORT}"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
newtest() { newtest() {
n=`expr $n + 1` n=`expr $n + 1`

2
bin/tests/system/ecdsa/ns1/sign.sh
View File

@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
zone=. zone=.
infile=root.db.in infile=root.db.in

2
bin/tests/system/ecdsa/setup.sh
View File

@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

2
bin/tests/system/ecdsa/tests.sh
View File

@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
status=0 status=0
n=1 n=1

2
bin/tests/system/eddsa/ns1/sign.sh
View File

@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
zone=. zone=.
infile=root.db.in infile=root.db.in

2
bin/tests/system/eddsa/ns2/sign.sh
View File

@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
zone=example.com. zone=example.com.
zonefile=example.com.db zonefile=example.com.db

2
bin/tests/system/eddsa/prereq.sh
View File

@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
if ! $SHELL ../testcrypto.sh eddsa; then if ! $SHELL ../testcrypto.sh eddsa; then
exit 1 exit 1

2
bin/tests/system/eddsa/setup.sh
View File

@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

2
bin/tests/system/eddsa/tests.sh
View File

@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
status=0 status=0
n=1 n=1

2
bin/tests/system/ednscompliance/setup.sh
View File

@ -9,6 +9,6 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf

2
bin/tests/system/ednscompliance/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="+norec -p ${PORT}" DIGOPTS="+norec -p ${PORT}"

2
bin/tests/system/emptyzones/setup.sh
View File

@ -7,7 +7,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$SHELL clean.sh $SHELL clean.sh
copy_setports ns1/named1.conf.in ns1/named.conf copy_setports ns1/named1.conf.in ns1/named.conf

4
bin/tests/system/emptyzones/tests.sh
View File

@ -9,10 +9,10 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGOPTS="-p ${PORT}" DIGOPTS="-p ${PORT}"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
status=0 status=0
n=0 n=0

2
bin/tests/system/fetchlimit/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf
copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns2/named.conf.in ns2/named.conf

2
bin/tests/system/fetchlimit/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DIGCMD="$DIG @10.53.0.3 -p ${PORT} +tcp +tries=1 +time=1" DIGCMD="$DIG @10.53.0.3 -p ${PORT} +tcp +tries=1 +time=1"
RNDCCMD="$RNDC -p ${CONTROLPORT} -s 10.53.0.3 -c ../common/rndc.conf" RNDCCMD="$RNDC -p ${CONTROLPORT} -s 10.53.0.3 -c ../common/rndc.conf"

2
bin/tests/system/filter-aaaa/ns1/sign.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../../conf.sh
SYSTESTDIR=filter-aaaa SYSTESTDIR=filter-aaaa

2
bin/tests/system/filter-aaaa/ns4/sign.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../../conf.sh
SYSTESTDIR=filter-aaaa SYSTESTDIR=filter-aaaa

2
bin/tests/system/filter-aaaa/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named1.conf.in ns1/named.conf copy_setports ns1/named1.conf.in ns1/named.conf
copy_setports ns2/named1.conf.in ns2/named.conf copy_setports ns2/named1.conf.in ns2/named.conf

4
bin/tests/system/filter-aaaa/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=0 n=0
@ -17,7 +17,7 @@ n=0
rm -f dig.out.* rm -f dig.out.*
DIGOPTS="+tcp +noadd +nosea +nostat +nocmd -p ${PORT}" DIGOPTS="+tcp +noadd +nosea +nostat +nocmd -p ${PORT}"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
for conf in conf/good*.conf for conf in conf/good*.conf
do do

2
bin/tests/system/formerr/setup.sh
View File

@ -9,6 +9,6 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf

2
bin/tests/system/formerr/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0

2
bin/tests/system/forward/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$SHELL clean.sh $SHELL clean.sh
copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns1/named.conf.in ns1/named.conf

2
bin/tests/system/forward/tests.sh
View File

@ -8,7 +8,7 @@
# information regarding copyright ownership. # information regarding copyright ownership.
#shellcheck source=conf.sh #shellcheck source=conf.sh
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
dig_with_opts() ( dig_with_opts() (
"$DIG" -p "$PORT" "$@" "$DIG" -p "$PORT" "$@"

2
bin/tests/system/geoip2/prereq.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$FEATURETEST --have-geoip2 || { $FEATURETEST --have-geoip2 || {
echo_i "This test requires GeoIP support." >&2 echo_i "This test requires GeoIP support." >&2

2
bin/tests/system/geoip2/setup.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
$SHELL clean.sh $SHELL clean.sh

4
bin/tests/system/geoip2/tests.sh
View File

@ -9,7 +9,7 @@
# See the COPYRIGHT file distributed with this work for additional # See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership. # information regarding copyright ownership.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
status=0 status=0
n=0 n=0
@ -18,7 +18,7 @@ rm -f dig.out.*
DIGOPTS="+tcp +short -p ${PORT} @10.53.0.2" DIGOPTS="+tcp +short -p ${PORT} @10.53.0.2"
DIGOPTS6="+tcp +short -p ${PORT} @fd92:7065:b8e:ffff::2 -6" DIGOPTS6="+tcp +short -p ${PORT} @fd92:7065:b8e:ffff::2 -6"
RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"
for conf in conf/good*.conf for conf in conf/good*.conf
do do

Some files were not shown because too many files have changed in this diff Show More