Drop $SYSTEMTESTTOP from bin/tests/system/

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.
2025-08-22 10:10:06 +00:00 · 2020-07-21 12:12:59 +02:00 · 2020-07-21 12:12:59 +02:00 · 093af1c00a
commit 093af1c00a
parent 6237be992f
277 changed files with 346 additions and 356 deletions
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@ -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:

-    . $SYSTEMTESTTOP/conf.sh
+    . ../conf.sh

 "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
--- a/bin/tests/system/acl/setup.sh
+++ b/bin/tests/system/acl/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

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

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 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
 t=0
--- a/bin/tests/system/additional/setup.sh
+++ b/bin/tests/system/additional/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

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

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"

 status=0
 n=0
--- a/bin/tests/system/addzone/setup.sh
+++ b/bin/tests/system/addzone/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 cp -f ns1/redirect.db.1 ns1/redirect.db
 cp -f ns2/redirect.db.1 ns2/redirect.db
--- a/bin/tests/system/addzone/tests.sh
+++ b/bin/tests/system/addzone/tests.sh
@ -9,10 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 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() (
    $RNDCCMD "10.53.0.$1" zonestatus -redirect > "zonestatus.out.ns$1.$n" &&
--- a/bin/tests/system/allow-query/setup.sh
+++ b/bin/tests/system/allow-query/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ../common/controls.conf.in ns2/controls.conf
 copy_setports  ns1/named.conf.in ns1/named.conf
--- a/bin/tests/system/allow-query/tests.sh
+++ b/bin/tests/system/allow-query/tests.sh
@ -50,7 +50,7 @@
 # and querying as necessary.
 #

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noauth +noadd +nostats +dnssec -p ${PORT}"

--- a/bin/tests/system/auth/setup.sh
+++ b/bin/tests/system/auth/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/auth/tests.sh
+++ b/bin/tests/system/auth/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 DIGOPTS="+tcp -p ${PORT}"

--- a/bin/tests/system/autosign/ns1/keygen.sh
+++ b/bin/tests/system/autosign/ns1/keygen.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../../conf.sh

 zone=.
 zonefile=root.db
--- a/bin/tests/system/autosign/ns2/keygen.sh
+++ b/bin/tests/system/autosign/ns2/keygen.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../../conf.sh

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

-. $SYSTEMTESTTOP/conf.sh
+. ../../conf.sh

 SYSTESTDIR=autosign

--- a/bin/tests/system/autosign/setup.sh
+++ b/bin/tests/system/autosign/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/autosign/tests.sh
+++ b/bin/tests/system/autosign/tests.sh
@ -9,13 +9,13 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=0

 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
 showprivate () {
--- a/bin/tests/system/builtin/setup.sh
+++ b/bin/tests/system/builtin/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/builtin/tests.sh
+++ b/bin/tests/system/builtin/tests.sh
@ -7,10 +7,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"

 status=0
 n=0
--- a/bin/tests/system/cacheclean/setup.sh
+++ b/bin/tests/system/cacheclean/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/cacheclean/tests.sh
+++ b/bin/tests/system/cacheclean/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=0
--- a/bin/tests/system/case/setup.sh
+++ b/bin/tests/system/case/setup.sh
@ -7,7 +7,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 cp -f ns1/dynamic.db.in ns1/dynamic.db
 copy_setports ns1/named.conf.in ns1/named.conf
--- a/bin/tests/system/case/tests.sh
+++ b/bin/tests/system/case/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 DIGOPTS="+tcp +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}"

--- a/bin/tests/system/catz/setup.sh
+++ b/bin/tests/system/catz/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 $SHELL clean.sh

--- a/bin/tests/system/catz/tests.sh
+++ b/bin/tests/system/catz/tests.sh
@ -12,14 +12,14 @@
 set -e

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

 dig_with_opts() {
 	"$DIG" -p "${PORT}" "$@"
 }

 rndccmd() (
-	"$RNDC" -c "$SYSTEMTESTTOP/common/rndc.conf" -p "${CONTROLPORT}" -s "$@"
+	"$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@"
 )

 _wait_for_message() (
--- a/bin/tests/system/cds/setup.sh
+++ b/bin/tests/system/cds/setup.sh
@ -11,7 +11,7 @@

 set -eu

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 touch empty

--- a/bin/tests/system/cds/tests.sh
+++ b/bin/tests/system/cds/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=0
--- a/bin/tests/system/chain/ns2/sign.sh
+++ b/bin/tests/system/chain/ns2/sign.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../../conf.sh

 zone=example.
 zonefile=example.db
--- a/bin/tests/system/chain/setup.sh
+++ b/bin/tests/system/chain/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/chain/tests.sh
+++ b/bin/tests/system/chain/tests.sh
@ -7,10 +7,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"

 sendcmd() {
    send 10.53.0.4 "${EXTRAPORT1}"
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@ -7,7 +7,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=0
--- a/bin/tests/system/checknames/setup.sh
+++ b/bin/tests/system/checknames/setup.sh
@ -7,7 +7,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 $SHELL clean.sh

--- a/bin/tests/system/checknames/tests.sh
+++ b/bin/tests/system/checknames/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=1
--- a/bin/tests/system/checkzone/setup.sh
+++ b/bin/tests/system/checkzone/setup.sh
@ -7,7 +7,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 ln -s $CHECKZONE named-compilezone

--- a/bin/tests/system/checkzone/tests.sh
+++ b/bin/tests/system/checkzone/tests.sh
@ -7,7 +7,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=1
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@ -13,8 +13,7 @@
 # Clean up after system tests.
 #

-SYSTEMTESTTOP=.
-. $SYSTEMTESTTOP/conf.sh
+. ./conf.sh


 find . -type f \( \
@ -25,7 +24,7 @@ find . -type f \( \

 status=0

-rm -f $SYSTEMTESTTOP/random.data
+rm -f ../random.data

 for d in $SUBDIRS
 do
--- a/bin/tests/system/cleanpkcs11.sh
+++ b/bin/tests/system/cleanpkcs11.sh
@ -9,6 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

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

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/cookie/tests.sh
+++ b/bin/tests/system/cookie/tests.sh
@ -9,10 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"

 status=0
 n=0
--- a/bin/tests/system/database/setup.sh
+++ b/bin/tests/system/database/setup.sh
@ -9,6 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named1.conf.in ns1/named.conf
--- a/bin/tests/system/database/tests.sh
+++ b/bin/tests/system/database/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=0
--- a/bin/tests/system/delzone/setup.sh
+++ b/bin/tests/system/delzone/setup.sh
@ -9,6 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 $SHELL clean.sh
--- a/bin/tests/system/delzone/tests.sh
+++ b/bin/tests/system/delzone/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

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

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0

--- a/bin/tests/system/digdelv/ns2/sign.sh
+++ b/bin/tests/system/digdelv/ns2/sign.sh
@ -10,7 +10,7 @@
 # information regarding copyright ownership.

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../../conf.sh

 set -e

--- a/bin/tests/system/digdelv/setup.sh
+++ b/bin/tests/system/digdelv/setup.sh
@ -10,7 +10,7 @@
 # information regarding copyright ownership.

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

 set -e

--- a/bin/tests/system/digdelv/tests.sh
+++ b/bin/tests/system/digdelv/tests.sh
@ -10,7 +10,7 @@
 # information regarding copyright ownership.

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

 set -e

--- a/bin/tests/system/dlz/prereq.sh
+++ b/bin/tests/system/dlz/prereq.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

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

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

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

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=0
--- a/bin/tests/system/dlzexternal/setup.sh
+++ b/bin/tests/system/dlzexternal/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 $TSIGKEYGEN ddns-key.example.nil > ns1/ddns.key

--- a/bin/tests/system/dlzexternal/tests.sh
+++ b/bin/tests/system/dlzexternal/tests.sh
@ -9,13 +9,13 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=0

 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() {
 	n=`expr $n + 1`
--- a/bin/tests/system/dns64/ns1/sign.sh
+++ b/bin/tests/system/dns64/ns1/sign.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../../conf.sh

 zone=signed
 infile=example.db
--- a/bin/tests/system/dns64/setup.sh
+++ b/bin/tests/system/dns64/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/dns64/tests.sh
+++ b/bin/tests/system/dns64/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=0
--- a/bin/tests/system/dnssec/ns1/sign.sh
+++ b/bin/tests/system/dnssec/ns1/sign.sh
@ -10,7 +10,7 @@
 # information regarding copyright ownership.

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../../conf.sh

 set -e

--- a/bin/tests/system/dnssec/ns2/sign.sh
+++ b/bin/tests/system/dnssec/ns2/sign.sh
@ -10,7 +10,7 @@
 # information regarding copyright ownership.

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../../conf.sh

 set -e

--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@ -10,7 +10,7 @@
 # information regarding copyright ownership.

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../../conf.sh

 set -e

--- a/bin/tests/system/dnssec/ns5/sign.sh
+++ b/bin/tests/system/dnssec/ns5/sign.sh
@ -10,7 +10,7 @@
 # information regarding copyright ownership.

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../../conf.sh

 set -e

--- a/bin/tests/system/dnssec/ns6/sign.sh
+++ b/bin/tests/system/dnssec/ns6/sign.sh
@ -10,7 +10,7 @@
 # information regarding copyright ownership.

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../../conf.sh

 set -e

--- a/bin/tests/system/dnssec/ns7/sign.sh
+++ b/bin/tests/system/dnssec/ns7/sign.sh
@ -10,7 +10,7 @@
 # information regarding copyright ownership.

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../../conf.sh

 set -e

--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@ -10,7 +10,7 @@
 # information regarding copyright ownership.

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

 set -e

--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@ -10,7 +10,7 @@
 # information regarding copyright ownership.

 # shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

 set -e

@ -36,7 +36,7 @@ delv_with_opts() {
 }

 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
@ -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
 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
-$PERL $SYSTEMTESTTOP/stop.pl dnssec ns1 || ret=1
+$PERL ../stop.pl dnssec ns1 || ret=1
 nextpart ns1/named.run > /dev/null
 start_server --noclean --restart --port ${PORT} dnssec ns1 || ret=1
 n=$(($n+1))
--- a/bin/tests/system/dnstap/setup.sh
+++ b/bin/tests/system/dnstap/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/dnstap/tests.sh
+++ b/bin/tests/system/dnstap/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

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

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/dscp/tests.sh
+++ b/bin/tests/system/dscp/tests.sh
@ -7,7 +7,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 DIGOPTS="+tcp +noadd +nosea +nostat +noquest -p ${PORT}"

--- a/bin/tests/system/dsdigest/ns1/sign.sh
+++ b/bin/tests/system/dsdigest/ns1/sign.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../../conf.sh

 zone=.
 infile=root.db.in
--- a/bin/tests/system/dsdigest/ns2/sign.sh
+++ b/bin/tests/system/dsdigest/ns2/sign.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../../conf.sh

 zone1=good
 infile1=good.db.in
--- a/bin/tests/system/dsdigest/setup.sh
+++ b/bin/tests/system/dsdigest/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/dsdigest/tests.sh
+++ b/bin/tests/system/dsdigest/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0

--- a/bin/tests/system/dupsigs/ns1/reset_keys.sh
+++ b/bin/tests/system/dupsigs/ns1/reset_keys.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 zone=signing.test
 rm -rf keys/signing.test
--- a/bin/tests/system/dupsigs/setup.sh
+++ b/bin/tests/system/dupsigs/setup.sh
@ -7,7 +7,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 $SHELL clean.sh

--- a/bin/tests/system/dupsigs/tests.sh
+++ b/bin/tests/system/dupsigs/tests.sh
@ -7,7 +7,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 start=`date +%s`
--- a/bin/tests/system/dyndb/setup.sh
+++ b/bin/tests/system/dyndb/setup.sh
@ -9,6 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
--- a/bin/tests/system/dyndb/tests.sh
+++ b/bin/tests/system/dyndb/tests.sh
@ -9,13 +9,13 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=0

 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() {
 	n=`expr $n + 1`
--- a/bin/tests/system/ecdsa/ns1/sign.sh
+++ b/bin/tests/system/ecdsa/ns1/sign.sh
@ -11,7 +11,7 @@

 set -e

-. "$SYSTEMTESTTOP/conf.sh"
+. ../../conf.sh

 zone=.
 infile=root.db.in
--- a/bin/tests/system/ecdsa/setup.sh
+++ b/bin/tests/system/ecdsa/setup.sh
@ -11,7 +11,7 @@

 set -e

-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/ecdsa/tests.sh
+++ b/bin/tests/system/ecdsa/tests.sh
@ -11,7 +11,7 @@

 set -e

-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

 status=0
 n=1
--- a/bin/tests/system/eddsa/ns1/sign.sh
+++ b/bin/tests/system/eddsa/ns1/sign.sh
@ -11,7 +11,7 @@

 set -e

-. "$SYSTEMTESTTOP/conf.sh"
+. ../../conf.sh

 zone=.
 infile=root.db.in
--- a/bin/tests/system/eddsa/ns2/sign.sh
+++ b/bin/tests/system/eddsa/ns2/sign.sh
@ -11,7 +11,7 @@

 set -e

-. "$SYSTEMTESTTOP/conf.sh"
+. ../../conf.sh

 zone=example.com.
 zonefile=example.com.db
--- a/bin/tests/system/eddsa/prereq.sh
+++ b/bin/tests/system/eddsa/prereq.sh
@ -11,7 +11,7 @@

 set -e

-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

 if ! $SHELL ../testcrypto.sh eddsa; then
 	exit 1
--- a/bin/tests/system/eddsa/setup.sh
+++ b/bin/tests/system/eddsa/setup.sh
@ -11,7 +11,7 @@

 set -e

-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/eddsa/tests.sh
+++ b/bin/tests/system/eddsa/tests.sh
@ -11,7 +11,7 @@

 set -e

-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

 status=0
 n=1
--- a/bin/tests/system/ednscompliance/setup.sh
+++ b/bin/tests/system/ednscompliance/setup.sh
@ -9,6 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
--- a/bin/tests/system/ednscompliance/tests.sh
+++ b/bin/tests/system/ednscompliance/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 DIGOPTS="+norec -p ${PORT}"

--- a/bin/tests/system/emptyzones/setup.sh
+++ b/bin/tests/system/emptyzones/setup.sh
@ -7,7 +7,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 $SHELL clean.sh
 copy_setports ns1/named1.conf.in ns1/named.conf
--- a/bin/tests/system/emptyzones/tests.sh
+++ b/bin/tests/system/emptyzones/tests.sh
@ -9,10 +9,10 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 DIGOPTS="-p ${PORT}"
-RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s"
+RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s"

 status=0
 n=0
--- a/bin/tests/system/fetchlimit/setup.sh
+++ b/bin/tests/system/fetchlimit/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf
--- a/bin/tests/system/fetchlimit/tests.sh
+++ b/bin/tests/system/fetchlimit/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 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"
--- a/bin/tests/system/filter-aaaa/ns1/sign.sh
+++ b/bin/tests/system/filter-aaaa/ns1/sign.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../../conf.sh

 SYSTESTDIR=filter-aaaa

--- a/bin/tests/system/filter-aaaa/ns4/sign.sh
+++ b/bin/tests/system/filter-aaaa/ns4/sign.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../../conf.sh

 SYSTESTDIR=filter-aaaa

--- a/bin/tests/system/filter-aaaa/setup.sh
+++ b/bin/tests/system/filter-aaaa/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named1.conf.in ns1/named.conf
 copy_setports ns2/named1.conf.in ns2/named.conf
--- a/bin/tests/system/filter-aaaa/tests.sh
+++ b/bin/tests/system/filter-aaaa/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=0
@ -17,7 +17,7 @@ n=0
 rm -f dig.out.*

 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
 do
--- a/bin/tests/system/formerr/setup.sh
+++ b/bin/tests/system/formerr/setup.sh
@ -9,6 +9,6 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 copy_setports ns1/named.conf.in ns1/named.conf
--- a/bin/tests/system/formerr/tests.sh
+++ b/bin/tests/system/formerr/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0

--- a/bin/tests/system/forward/setup.sh
+++ b/bin/tests/system/forward/setup.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 $SHELL clean.sh
 copy_setports ns1/named.conf.in ns1/named.conf
--- a/bin/tests/system/forward/tests.sh
+++ b/bin/tests/system/forward/tests.sh
@ -8,7 +8,7 @@
 # information regarding copyright ownership.

 #shellcheck source=conf.sh
-. "$SYSTEMTESTTOP/conf.sh"
+. ../conf.sh

 dig_with_opts() (
 	"$DIG" -p "$PORT" "$@"
--- a/bin/tests/system/geoip2/prereq.sh
+++ b/bin/tests/system/geoip2/prereq.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

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

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 $SHELL clean.sh

--- a/bin/tests/system/geoip2/tests.sh
+++ b/bin/tests/system/geoip2/tests.sh
@ -9,7 +9,7 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.

-. $SYSTEMTESTTOP/conf.sh
+. ../conf.sh

 status=0
 n=0
@ -18,7 +18,7 @@ rm -f dig.out.*

 DIGOPTS="+tcp +short -p ${PORT} @10.53.0.2"
 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
 do
--- a/Show More
+++ b/Show More