...
 
Commits (6)
...@@ -404,6 +404,7 @@ misc: ...@@ -404,6 +404,7 @@ misc:
- xmllint --noout --nonet `git ls-files '*.xml' '*.docbook'` - xmllint --noout --nonet `git ls-files '*.xml' '*.docbook'`
- sh util/check-win32util-configure - sh util/check-win32util-configure
- sh util/check-categories.sh - sh util/check-categories.sh
- if git grep SYSTEMTESTTOP -- ':!.gitlab-ci.yml'; then echo 'Please use relative paths instead of $SYSTEMTESTTOP.'; exit 1; fi
needs: [] needs: []
artifacts: artifacts:
paths: paths:
......
...@@ -374,7 +374,7 @@ a run of the full test suite (e.g. the tests are started with "runall.sh"). ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,10 +9,10 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,10 +9,10 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,10 +9,10 @@ ...@@ -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" &&
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -50,7 +50,7 @@ ...@@ -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}"
......
...@@ -9,7 +9,7 @@ ...@@ -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
...@@ -9,7 +9,7 @@ ...@@ -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}"
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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 )
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,13 +9,13 @@ ...@@ -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 () {
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -7,10 +7,10 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -7,7 +7,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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}"
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -12,14 +12,14 @@ ...@@ -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() (
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
set -eu set -eu
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
touch empty touch empty
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -7,10 +7,10 @@ ...@@ -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}"
......
...@@ -7,7 +7,7 @@ ...@@ -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
......
...@@ -7,7 +7,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -7,7 +7,7 @@ ...@@ -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
......
...@@ -7,7 +7,7 @@ ...@@ -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
......
...@@ -17,7 +17,7 @@ set -e ...@@ -17,7 +17,7 @@ set -e
# and differ from dnsrpz.conf which is used by dnsrpzd. # and differ from dnsrpz.conf which is used by dnsrpzd.
. $SYSTEMTESTTOP/conf.sh . ../conf.sh
DNSRPS_CMD=../rpz/dnsrps DNSRPS_CMD=../rpz/dnsrps
......
...@@ -13,8 +13,7 @@ ...@@ -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 \( \ ...@@ -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
......
...@@ -9,6 +9,6 @@ ...@@ -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
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,10 +9,10 @@ ...@@ -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
......
...@@ -9,6 +9,6 @@ ...@@ -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
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,6 +9,6 @@ ...@@ -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
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -10,7 +10,7 @@ ...@@ -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
......
...@@ -10,7 +10,7 @@ ...@@ -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
......
...@@ -10,7 +10,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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"
......
...@@ -9,7 +9,7 @@ ...@@ -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
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,13 +9,13 @@ ...@@ -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`
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -10,7 +10,7 @@ ...@@ -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
......
...@@ -10,7 +10,7 @@ ...@@ -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
......
...@@ -10,7 +10,7 @@ ...@@ -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
......
...@@ -10,7 +10,7 @@ ...@@ -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
......
...@@ -10,7 +10,7 @@ ...@@ -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
......
...@@ -10,7 +10,7 @@ ...@@ -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
......
...@@ -10,7 +10,7 @@ ...@@ -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
......
...@@ -10,7 +10,7 @@ ...@@ -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() { ...@@ -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 ...@@ -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))
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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"
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -7,7 +7,7 @@ ...@@ -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}"
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -7,7 +7,7 @@ ...@@ -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
......
...@@ -7,7 +7,7 @@ ...@@ -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`
......
...@@ -9,6 +9,6 @@ ...@@ -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
...@@ -9,13 +9,13 @@ ...@@ -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`
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
zone=. zone=.
infile=root.db.in infile=root.db.in
......
...@@ -11,7 +11,7 @@ ...@@ -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
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
status=0 status=0
n=1 n=1
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../../conf.sh
zone=. zone=.
infile=root.db.in infile=root.db.in
......
...@@ -11,7 +11,7 @@ ...@@ -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
......
...@@ -11,7 +11,7 @@ ...@@ -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
......
...@@ -11,7 +11,7 @@ ...@@ -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
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
set -e set -e
. "$SYSTEMTESTTOP/conf.sh" . ../conf.sh
status=0 status=0
n=1 n=1
......
...@@ -9,6 +9,6 @@ ...@@ -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
...@@ -9,7 +9,7 @@ ...@@ -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}"
......
...@@ -7,7 +7,7 @@ ...@@ -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
...@@ -9,10 +9,10 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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
......
...@@ -9,7 +9,7 @@ ...@@ -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"