From: Michal Nowak Date: Tue, 21 Jul 2020 10:12:59 +0000 (+0200) Subject: Drop $SYSTEMTESTTOP from bin/tests/system/ X-Git-Tag: v9.17.4~27^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=093af1c00ac25e4f132fe2442a24e1264aadb28d;p=thirdparty%2Fbind9.git 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. --- diff --git a/bin/tests/system/README b/bin/tests/system/README index 068c1107bdd..3ec1da1ee30 100644 --- 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 diff --git a/bin/tests/system/acl/setup.sh b/bin/tests/system/acl/setup.sh index aff35aa2be3..8b7a84f4d5b 100644 --- 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 diff --git a/bin/tests/system/acl/tests.sh b/bin/tests/system/acl/tests.sh index bfcd7f3fe8f..e13bfc44422 100644 --- 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 diff --git a/bin/tests/system/additional/setup.sh b/bin/tests/system/additional/setup.sh index 557a16243c4..316eeecf6ef 100644 --- 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 diff --git a/bin/tests/system/additional/tests.sh b/bin/tests/system/additional/tests.sh index 1221e0c6c3d..4039f2a01f7 100644 --- 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 diff --git a/bin/tests/system/addzone/setup.sh b/bin/tests/system/addzone/setup.sh index e8310f60f03..0f56e7f4c8c 100644 --- 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 diff --git a/bin/tests/system/addzone/tests.sh b/bin/tests/system/addzone/tests.sh index cec70e823dc..0c98912b06b 100755 --- 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" && diff --git a/bin/tests/system/allow-query/setup.sh b/bin/tests/system/allow-query/setup.sh index 7c6dfe1fa53..d8e62656d1a 100644 --- 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 diff --git a/bin/tests/system/allow-query/tests.sh b/bin/tests/system/allow-query/tests.sh index 0ba574a04ea..670a65b426a 100644 --- 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}" diff --git a/bin/tests/system/auth/setup.sh b/bin/tests/system/auth/setup.sh index 9fa04998dad..2989fc17b0f 100644 --- 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 diff --git a/bin/tests/system/auth/tests.sh b/bin/tests/system/auth/tests.sh index 0cd1b721be4..7fcfb00fddb 100644 --- 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}" diff --git a/bin/tests/system/autosign/ns1/keygen.sh b/bin/tests/system/autosign/ns1/keygen.sh index 79637acd967..8967b3f28d9 100644 --- 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 diff --git a/bin/tests/system/autosign/ns2/keygen.sh b/bin/tests/system/autosign/ns2/keygen.sh index e4b91838c1b..e42a6744a13 100644 --- 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 ) diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh index fd26f28b4ec..30b72652891 100644 --- 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 diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh index e6099c14729..477b43f2b27 100644 --- 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 diff --git a/bin/tests/system/autosign/tests.sh b/bin/tests/system/autosign/tests.sh index 6cd45cb73ff..3b6b2f7d323 100755 --- 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 () { diff --git a/bin/tests/system/builtin/setup.sh b/bin/tests/system/builtin/setup.sh index e683db06d94..aadae5085b1 100644 --- 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 diff --git a/bin/tests/system/builtin/tests.sh b/bin/tests/system/builtin/tests.sh index e4dfc600238..5a4c3ce9623 100644 --- 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 diff --git a/bin/tests/system/cacheclean/setup.sh b/bin/tests/system/cacheclean/setup.sh index 9fa04998dad..2989fc17b0f 100644 --- 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 diff --git a/bin/tests/system/cacheclean/tests.sh b/bin/tests/system/cacheclean/tests.sh index da3a4dba6a9..a204cbcdb8c 100755 --- 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 diff --git a/bin/tests/system/case/setup.sh b/bin/tests/system/case/setup.sh index 1d467ac6387..7c1b64ce39a 100644 --- 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 diff --git a/bin/tests/system/case/tests.sh b/bin/tests/system/case/tests.sh index 3669183f7cb..f5ea0b9a635 100644 --- 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}" diff --git a/bin/tests/system/catz/setup.sh b/bin/tests/system/catz/setup.sh index 285cacf7f7f..4879f3fa3af 100644 --- 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 diff --git a/bin/tests/system/catz/tests.sh b/bin/tests/system/catz/tests.sh index c79540c4cb3..2b650f38d4d 100644 --- 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() ( diff --git a/bin/tests/system/cds/setup.sh b/bin/tests/system/cds/setup.sh index 75f4a8eb1f5..eac54ccdea7 100644 --- 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 diff --git a/bin/tests/system/cds/tests.sh b/bin/tests/system/cds/tests.sh index 717af19353a..d0542cc31d7 100644 --- 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 diff --git a/bin/tests/system/chain/ns2/sign.sh b/bin/tests/system/chain/ns2/sign.sh index a1ea0e33ad5..6586e59fc64 100644 --- 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 diff --git a/bin/tests/system/chain/setup.sh b/bin/tests/system/chain/setup.sh index a557b44afef..b08b15f328a 100644 --- 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 diff --git a/bin/tests/system/chain/tests.sh b/bin/tests/system/chain/tests.sh index d8b17cfd0a8..2397d897ff9 100644 --- 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}" diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh index dc8f4b28a91..2b6d03614a5 100644 --- 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 diff --git a/bin/tests/system/checknames/setup.sh b/bin/tests/system/checknames/setup.sh index 15f597c8291..5c6613f02f6 100644 --- 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 diff --git a/bin/tests/system/checknames/tests.sh b/bin/tests/system/checknames/tests.sh index 70558b1ddd1..4897c34f078 100644 --- 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 diff --git a/bin/tests/system/checkzone/setup.sh b/bin/tests/system/checkzone/setup.sh index 96f32bb596a..8fd9e26d6db 100644 --- 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 diff --git a/bin/tests/system/checkzone/tests.sh b/bin/tests/system/checkzone/tests.sh index 3735689f718..6daccffc2a0 100644 --- 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 diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh index d4b3c665cc6..54cdfe6996d 100644 --- 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 diff --git a/bin/tests/system/cleanpkcs11.sh b/bin/tests/system/cleanpkcs11.sh index 7c44ce265bc..d20c51a371c 100644 --- 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 diff --git a/bin/tests/system/cookie/setup.sh b/bin/tests/system/cookie/setup.sh index ecc72c02769..d25b6eca179 100644 --- 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 diff --git a/bin/tests/system/cookie/tests.sh b/bin/tests/system/cookie/tests.sh index 3871fd37f96..a17d1ed4d6e 100755 --- 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 diff --git a/bin/tests/system/database/setup.sh b/bin/tests/system/database/setup.sh index 303e87e5eaf..ca378fdeb8a 100644 --- 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 diff --git a/bin/tests/system/database/tests.sh b/bin/tests/system/database/tests.sh index e70de1ac0c5..8c850438f97 100644 --- 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 diff --git a/bin/tests/system/delzone/setup.sh b/bin/tests/system/delzone/setup.sh index 20a115a4d00..903fe153673 100644 --- 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 diff --git a/bin/tests/system/delzone/tests.sh b/bin/tests/system/delzone/tests.sh index 9a94212e116..b1b2ac7ebd4 100755 --- 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 diff --git a/bin/tests/system/dialup/tests.sh b/bin/tests/system/dialup/tests.sh index a0f622fe847..74b7b4a7d07 100644 --- 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 diff --git a/bin/tests/system/digdelv/ns2/sign.sh b/bin/tests/system/digdelv/ns2/sign.sh index efc2b30a588..a85cd99dd4b 100644 --- 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 diff --git a/bin/tests/system/digdelv/setup.sh b/bin/tests/system/digdelv/setup.sh index 4f37d0228c9..e1a64b8c119 100644 --- 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 diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh index 6930a1c8ccf..550f6964f6c 100644 --- 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 diff --git a/bin/tests/system/dlz/prereq.sh b/bin/tests/system/dlz/prereq.sh index c45c2b2c4c3..7813e45631c 100644 --- 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" diff --git a/bin/tests/system/dlz/setup.sh b/bin/tests/system/dlz/setup.sh index bf1af390f24..f12c3ab3f3d 100644 --- 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 diff --git a/bin/tests/system/dlz/tests.sh b/bin/tests/system/dlz/tests.sh index e0be7c0a754..1684a071876 100644 --- 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 diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh index d7551eade99..bd457c68b53 100644 --- 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 diff --git a/bin/tests/system/dlzexternal/tests.sh b/bin/tests/system/dlzexternal/tests.sh index d843fa117b2..3374dfd06a6 100644 --- 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` diff --git a/bin/tests/system/dns64/ns1/sign.sh b/bin/tests/system/dns64/ns1/sign.sh index c0c32e0418b..c087dc14d10 100644 --- 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 diff --git a/bin/tests/system/dns64/setup.sh b/bin/tests/system/dns64/setup.sh index f2c1131a1de..782cb065417 100644 --- 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 diff --git a/bin/tests/system/dns64/tests.sh b/bin/tests/system/dns64/tests.sh index fbe9ad71dcf..57df25b4886 100644 --- 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 diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh index 58827895007..bdc67ec4b3d 100644 --- 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 diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh index c99f7a537ce..9cbf15fefb0 100644 --- 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 diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh index cff898af748..123a9700076 100644 --- 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 diff --git a/bin/tests/system/dnssec/ns5/sign.sh b/bin/tests/system/dnssec/ns5/sign.sh index 54ae148e0ca..f20bbe56f5c 100644 --- 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 diff --git a/bin/tests/system/dnssec/ns6/sign.sh b/bin/tests/system/dnssec/ns6/sign.sh index 80d8881c150..29a4dd634d0 100644 --- 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 diff --git a/bin/tests/system/dnssec/ns7/sign.sh b/bin/tests/system/dnssec/ns7/sign.sh index 625300339cf..ef12066ad5b 100644 --- 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 diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh index 9798e34be79..a01b4fbf6fa 100644 --- 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 diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh index 566a4f09518..f17927d675b 100644 --- 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)) diff --git a/bin/tests/system/dnstap/setup.sh b/bin/tests/system/dnstap/setup.sh index 53c207eedb8..5dd570ec02b 100644 --- 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 diff --git a/bin/tests/system/dnstap/tests.sh b/bin/tests/system/dnstap/tests.sh index 0ed31056ae8..7aaced024b4 100644 --- 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" diff --git a/bin/tests/system/dscp/setup.sh b/bin/tests/system/dscp/setup.sh index 60ed4a345db..810fd285d4e 100644 --- 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 diff --git a/bin/tests/system/dscp/tests.sh b/bin/tests/system/dscp/tests.sh index 2d2d6d240d4..ceb2e24fb95 100644 --- 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}" diff --git a/bin/tests/system/dsdigest/ns1/sign.sh b/bin/tests/system/dsdigest/ns1/sign.sh index ccf14bcd8e3..0537546f96e 100644 --- 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 diff --git a/bin/tests/system/dsdigest/ns2/sign.sh b/bin/tests/system/dsdigest/ns2/sign.sh index 4d2ea08dff7..bb528186da7 100644 --- 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 diff --git a/bin/tests/system/dsdigest/setup.sh b/bin/tests/system/dsdigest/setup.sh index e7308b015ac..30d7f277ea8 100644 --- 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 diff --git a/bin/tests/system/dsdigest/tests.sh b/bin/tests/system/dsdigest/tests.sh index b254fd970ca..4c24cd58989 100644 --- 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 diff --git a/bin/tests/system/dupsigs/ns1/reset_keys.sh b/bin/tests/system/dupsigs/ns1/reset_keys.sh index 984d68ba973..c347c47a228 100644 --- 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 diff --git a/bin/tests/system/dupsigs/setup.sh b/bin/tests/system/dupsigs/setup.sh index e35a82962e8..efe74569bc0 100644 --- 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 diff --git a/bin/tests/system/dupsigs/tests.sh b/bin/tests/system/dupsigs/tests.sh index 5ea9279ea79..74c23135900 100644 --- 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` diff --git a/bin/tests/system/dyndb/setup.sh b/bin/tests/system/dyndb/setup.sh index 0f5767dcebb..7b8f53bfd5e 100644 --- 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 diff --git a/bin/tests/system/dyndb/tests.sh b/bin/tests/system/dyndb/tests.sh index 313204c00c8..4ed198f7b4a 100644 --- 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` diff --git a/bin/tests/system/ecdsa/ns1/sign.sh b/bin/tests/system/ecdsa/ns1/sign.sh index 9fc7ddb93f8..411f99a70b2 100644 --- 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 diff --git a/bin/tests/system/ecdsa/setup.sh b/bin/tests/system/ecdsa/setup.sh index 69c4995f41b..6b747792eb2 100644 --- 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 diff --git a/bin/tests/system/ecdsa/tests.sh b/bin/tests/system/ecdsa/tests.sh index 8fc2b21b192..aedbf2fc509 100644 --- 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 diff --git a/bin/tests/system/eddsa/ns1/sign.sh b/bin/tests/system/eddsa/ns1/sign.sh index f1a462a263a..698d51d660c 100644 --- 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 diff --git a/bin/tests/system/eddsa/ns2/sign.sh b/bin/tests/system/eddsa/ns2/sign.sh index ddd7a927463..5c1f217013a 100644 --- 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 diff --git a/bin/tests/system/eddsa/prereq.sh b/bin/tests/system/eddsa/prereq.sh index e86ce7eb397..564d635d508 100644 --- 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 diff --git a/bin/tests/system/eddsa/setup.sh b/bin/tests/system/eddsa/setup.sh index 69c4995f41b..6b747792eb2 100644 --- 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 diff --git a/bin/tests/system/eddsa/tests.sh b/bin/tests/system/eddsa/tests.sh index 2dcc138c2fd..7505eba60ef 100644 --- 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 diff --git a/bin/tests/system/ednscompliance/setup.sh b/bin/tests/system/ednscompliance/setup.sh index 0f5767dcebb..7b8f53bfd5e 100644 --- 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 diff --git a/bin/tests/system/ednscompliance/tests.sh b/bin/tests/system/ednscompliance/tests.sh index 515db8aaf5d..433afddad64 100644 --- 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}" diff --git a/bin/tests/system/emptyzones/setup.sh b/bin/tests/system/emptyzones/setup.sh index 69eebf319ae..ff21b412976 100644 --- 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 diff --git a/bin/tests/system/emptyzones/tests.sh b/bin/tests/system/emptyzones/tests.sh index 93ee6334aee..b96cefac948 100644 --- 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 diff --git a/bin/tests/system/fetchlimit/setup.sh b/bin/tests/system/fetchlimit/setup.sh index c4e16dd4bde..cbc00cd64d3 100644 --- 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 diff --git a/bin/tests/system/fetchlimit/tests.sh b/bin/tests/system/fetchlimit/tests.sh index 027a439976c..8e9ee7b3d2b 100644 --- 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" diff --git a/bin/tests/system/filter-aaaa/ns1/sign.sh b/bin/tests/system/filter-aaaa/ns1/sign.sh index adc29af4a33..e8f3d37ddea 100755 --- 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 diff --git a/bin/tests/system/filter-aaaa/ns4/sign.sh b/bin/tests/system/filter-aaaa/ns4/sign.sh index 05780cf4c60..d7d5a43997a 100755 --- 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 diff --git a/bin/tests/system/filter-aaaa/setup.sh b/bin/tests/system/filter-aaaa/setup.sh index 21a33fb482d..a5ddcb20cac 100644 --- 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 diff --git a/bin/tests/system/filter-aaaa/tests.sh b/bin/tests/system/filter-aaaa/tests.sh index 0d7a1271df0..e5ac5460d8d 100644 --- 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 diff --git a/bin/tests/system/formerr/setup.sh b/bin/tests/system/formerr/setup.sh index 0f5767dcebb..7b8f53bfd5e 100644 --- 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 diff --git a/bin/tests/system/formerr/tests.sh b/bin/tests/system/formerr/tests.sh index 51e29ea6962..ca629c5f3c4 100644 --- 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 diff --git a/bin/tests/system/forward/setup.sh b/bin/tests/system/forward/setup.sh index 5d4894ead4f..45f8cc9775c 100644 --- 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 diff --git a/bin/tests/system/forward/tests.sh b/bin/tests/system/forward/tests.sh index 9a201e959f3..74c4eba217c 100644 --- 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" "$@" diff --git a/bin/tests/system/geoip2/prereq.sh b/bin/tests/system/geoip2/prereq.sh index 8178c2a9f26..a00c41e5238 100644 --- 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 diff --git a/bin/tests/system/geoip2/setup.sh b/bin/tests/system/geoip2/setup.sh index ef08a2152ea..ed37f527575 100644 --- 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 diff --git a/bin/tests/system/geoip2/tests.sh b/bin/tests/system/geoip2/tests.sh index 8147edb8119..fcd9df1408f 100644 --- 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 diff --git a/bin/tests/system/glue/setup.sh b/bin/tests/system/glue/setup.sh index 0f5767dcebb..7b8f53bfd5e 100644 --- a/bin/tests/system/glue/setup.sh +++ b/bin/tests/system/glue/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 diff --git a/bin/tests/system/glue/tests.sh b/bin/tests/system/glue/tests.sh index 2bb2f7166ec..95c26f941a6 100644 --- a/bin/tests/system/glue/tests.sh +++ b/bin/tests/system/glue/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 # # Do glue tests. diff --git a/bin/tests/system/idna/setup.sh b/bin/tests/system/idna/setup.sh index bf1af390f24..f12c3ab3f3d 100644 --- a/bin/tests/system/idna/setup.sh +++ b/bin/tests/system/idna/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 diff --git a/bin/tests/system/idna/tests.sh b/bin/tests/system/idna/tests.sh index 45350ae5b8c..6b7220bbc61 100644 --- a/bin/tests/system/idna/tests.sh +++ b/bin/tests/system/idna/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 # Set known locale for the tests diff --git a/bin/tests/system/include-multiplecfg/setup.sh b/bin/tests/system/include-multiplecfg/setup.sh index 44b0179e14b..6cebc568139 100644 --- a/bin/tests/system/include-multiplecfg/setup.sh +++ b/bin/tests/system/include-multiplecfg/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 diff --git a/bin/tests/system/include-multiplecfg/tests.sh b/bin/tests/system/include-multiplecfg/tests.sh index f2ce745b672..a3bc11030fa 100644 --- a/bin/tests/system/include-multiplecfg/tests.sh +++ b/bin/tests/system/include-multiplecfg/tests.sh @@ -12,7 +12,7 @@ # Test of include statement with glob expression. -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh DIGOPTS="+tcp +nosea +nostat +nocmd +norec +noques +noadd +nostats -p ${PORT}" diff --git a/bin/tests/system/inline/ns1/sign.sh b/bin/tests/system/inline/ns1/sign.sh index 587266d64af..4f495c0abe0 100644 --- a/bin/tests/system/inline/ns1/sign.sh +++ b/bin/tests/system/inline/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=. rm -f K.+*+*.key diff --git a/bin/tests/system/inline/ns3/sign.sh b/bin/tests/system/inline/ns3/sign.sh index cd4fc846a89..b00957cca43 100755 --- a/bin/tests/system/inline/ns3/sign.sh +++ b/bin/tests/system/inline/ns3/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 # Fake an unsupported key unsupportedkey=$("$KEYGEN" -q -a "$DEFAULT_ALGORITHM" -b "$DEFAULT_BITS" -n zone unsupported) diff --git a/bin/tests/system/inline/ns7/sign.sh b/bin/tests/system/inline/ns7/sign.sh index 462cd29e2ed..0330a456832 100755 --- a/bin/tests/system/inline/ns7/sign.sh +++ b/bin/tests/system/inline/ns7/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 # NOTE: The number of signing keys generated below is not coincidental. More # details can be found in the comment inside ns7/named.conf. diff --git a/bin/tests/system/inline/ns8/sign.sh b/bin/tests/system/inline/ns8/sign.sh index 4e8a8df0383..49f90e33676 100755 --- a/bin/tests/system/inline/ns8/sign.sh +++ b/bin/tests/system/inline/ns8/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 for zone in example01.com example02.com example03.com example04.com \ example05.com example06.com example07.com example08.com \ diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh index dd1a5f33c56..f06052ab236 100644 --- a/bin/tests/system/inline/setup.sh +++ b/bin/tests/system/inline/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 ns1/root.db.in ns1/root.db diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh index 9cfcb2ba0b5..c1d3d646601 100755 --- a/bin/tests/system/inline/tests.sh +++ b/bin/tests/system/inline/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 +dnssec -p ${PORT}" -RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" wait_for_serial() ( $DIG $DIGOPTS "@$1" "$2" SOA > "$4" @@ -1340,7 +1340,7 @@ check_done_signing () ( retry_quiet 10 check_done_signing || ret=1 # Halt rather than stopping the server to prevent the file from being # flushed upon shutdown since we specifically want to avoid it. -$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} inline ns3 +$PERL ../stop.pl --use-rndc --halt --port ${CONTROLPORT} inline ns3 ensure_sigs_only_in_journal delayedkeys ns3/delayedkeys.db.signed start_server --noclean --restart --port ${PORT} inline ns3 # At this point, the raw zone journal will not have a source serial set. Upon @@ -1349,7 +1349,7 @@ start_server --noclean --restart --port ${PORT} inline ns3 # return delayedkeys/SOA as the next node to resign, so we restart the server # once again; with the raw zone journal now having a source serial set, # receive_secure_serial() should refrain from introducing any zone changes. -$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} inline ns3 +$PERL ../stop.pl --use-rndc --halt --port ${CONTROLPORT} inline ns3 ensure_sigs_only_in_journal delayedkeys ns3/delayedkeys.db.signed nextpart ns3/named.run > /dev/null start_server --noclean --restart --port ${PORT} inline ns3 diff --git a/bin/tests/system/integrity/setup.sh b/bin/tests/system/integrity/setup.sh index 0f5767dcebb..7b8f53bfd5e 100644 --- a/bin/tests/system/integrity/setup.sh +++ b/bin/tests/system/integrity/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 diff --git a/bin/tests/system/integrity/tests.sh b/bin/tests/system/integrity/tests.sh index f125ddc4a27..fd7ceae7af0 100644 --- a/bin/tests/system/integrity/tests.sh +++ b/bin/tests/system/integrity/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="-p ${PORT}" diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh index 8f216ee5918..cd081e961f4 100644 --- a/bin/tests/system/ixfr/setup.sh +++ b/bin/tests/system/ixfr/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 diff --git a/bin/tests/system/ixfr/tests.sh b/bin/tests/system/ixfr/tests.sh index 60d77a97af7..ff585140b33 100644 --- a/bin/tests/system/ixfr/tests.sh +++ b/bin/tests/system/ixfr/tests.sh @@ -15,7 +15,7 @@ # in the log file - need a better approach - until then, # if you add any tests above that point, you will break the test. -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh wait_for_serial() ( $DIG $DIGOPTS "@$1" "$2" SOA > "$4" diff --git a/bin/tests/system/kasp/ns2/setup.sh b/bin/tests/system/kasp/ns2/setup.sh index 588735d0a6a..4436fc736f2 100644 --- a/bin/tests/system/kasp/ns2/setup.sh +++ b/bin/tests/system/kasp/ns2/setup.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh echo_i "ns2/setup.sh" diff --git a/bin/tests/system/kasp/ns3/setup.sh b/bin/tests/system/kasp/ns3/setup.sh index 548ee0c3dd6..b3c41d9c88d 100644 --- a/bin/tests/system/kasp/ns3/setup.sh +++ b/bin/tests/system/kasp/ns3/setup.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh echo_i "ns3/setup.sh" diff --git a/bin/tests/system/kasp/ns4/setup.sh b/bin/tests/system/kasp/ns4/setup.sh index 4b02fd3fa0a..18de440ddcd 100644 --- a/bin/tests/system/kasp/ns4/setup.sh +++ b/bin/tests/system/kasp/ns4/setup.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh echo_i "ns4/setup.sh" diff --git a/bin/tests/system/kasp/ns5/setup.sh b/bin/tests/system/kasp/ns5/setup.sh index b6f274e6a77..2fa500cfd46 100644 --- a/bin/tests/system/kasp/ns5/setup.sh +++ b/bin/tests/system/kasp/ns5/setup.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh echo_i "ns5/setup.sh" diff --git a/bin/tests/system/kasp/ns6/setup.sh b/bin/tests/system/kasp/ns6/setup.sh index a63db413ef7..08540f23875 100644 --- a/bin/tests/system/kasp/ns6/setup.sh +++ b/bin/tests/system/kasp/ns6/setup.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh echo_i "ns6/setup.sh" diff --git a/bin/tests/system/kasp/setup.sh b/bin/tests/system/kasp/setup.sh index a41b0ca946c..7552331990e 100644 --- a/bin/tests/system/kasp/setup.sh +++ b/bin/tests/system/kasp/setup.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh set -e diff --git a/bin/tests/system/kasp/tests.sh b/bin/tests/system/kasp/tests.sh index 5f92cf7f5ed..a2dbda682d2 100644 --- a/bin/tests/system/kasp/tests.sh +++ b/bin/tests/system/kasp/tests.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh start_time="$(TZ=UTC date +%s)" status=0 @@ -136,7 +136,7 @@ dig_with_opts() { # RNDC. rndccmd() { - "$RNDC" -c "$SYSTEMTESTTOP/common/rndc.conf" -p "$CONTROLPORT" -s "$@" + "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@" } # Print IDs of keys used for generating RRSIG records for RRsets of type $1 diff --git a/bin/tests/system/keepalive/setup.sh b/bin/tests/system/keepalive/setup.sh index e683db06d94..aadae5085b1 100644 --- a/bin/tests/system/keepalive/setup.sh +++ b/bin/tests/system/keepalive/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 diff --git a/bin/tests/system/keepalive/tests.sh b/bin/tests/system/keepalive/tests.sh index 0c067afc7a1..e29f785eab8 100644 --- a/bin/tests/system/keepalive/tests.sh +++ b/bin/tests/system/keepalive/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="-p ${PORT}" RNDCCMD="$RNDC -c ../common/rndc.conf -s 10.53.0.2 -p ${CONTROLPORT}" diff --git a/bin/tests/system/legacy/build.sh b/bin/tests/system/legacy/build.sh index 21094ce9d4c..eabc3b8d5ee 100644 --- a/bin/tests/system/legacy/build.sh +++ b/bin/tests/system/legacy/build.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 diff --git a/bin/tests/system/legacy/ns6/sign.sh b/bin/tests/system/legacy/ns6/sign.sh index 9a796db57da..fa9a7f96a5c 100755 --- a/bin/tests/system/legacy/ns6/sign.sh +++ b/bin/tests/system/legacy/ns6/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=legacy diff --git a/bin/tests/system/legacy/ns7/sign.sh b/bin/tests/system/legacy/ns7/sign.sh index 9a4ba792cc6..e20b97313e9 100755 --- a/bin/tests/system/legacy/ns7/sign.sh +++ b/bin/tests/system/legacy/ns7/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=legacy diff --git a/bin/tests/system/legacy/setup.sh b/bin/tests/system/legacy/setup.sh index 8dcb3689fea..aa13b05761b 100644 --- a/bin/tests/system/legacy/setup.sh +++ b/bin/tests/system/legacy/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/named.conf.in ns2/named.conf diff --git a/bin/tests/system/legacy/tests.sh b/bin/tests/system/legacy/tests.sh index 5af0265138a..12b658e3ef2 100755 --- a/bin/tests/system/legacy/tests.sh +++ b/bin/tests/system/legacy/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="-p ${PORT} +tries=1 +time=2" @@ -252,7 +252,7 @@ fi if [ $ret != 0 ]; then echo_i "failed"; fi status=`expr $status + $ret` -$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} legacy ns1 +$PERL ../stop.pl --use-rndc --port ${CONTROLPORT} legacy ns1 copy_setports ns1/named2.conf.in ns1/named.conf start_server --noclean --restart --port ${PORT} legacy ns1 diff --git a/bin/tests/system/limits/setup.sh b/bin/tests/system/limits/setup.sh index 0f5767dcebb..7b8f53bfd5e 100644 --- a/bin/tests/system/limits/setup.sh +++ b/bin/tests/system/limits/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 diff --git a/bin/tests/system/limits/tests.sh b/bin/tests/system/limits/tests.sh index 8b772997788..d9bd462726e 100644 --- a/bin/tests/system/limits/tests.sh +++ b/bin/tests/system/limits/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="-p ${PORT}" diff --git a/bin/tests/system/logfileconfig/setup.sh b/bin/tests/system/logfileconfig/setup.sh index c6198b70465..a19f43430fe 100644 --- a/bin/tests/system/logfileconfig/setup.sh +++ b/bin/tests/system/logfileconfig/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 diff --git a/bin/tests/system/logfileconfig/tests.sh b/bin/tests/system/logfileconfig/tests.sh index b04bd1994bc..d43f5ad72af 100644 --- a/bin/tests/system/logfileconfig/tests.sh +++ b/bin/tests/system/logfileconfig/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 THISDIR=`pwd` CONFDIR="ns1" diff --git a/bin/tests/system/masterfile/setup.sh b/bin/tests/system/masterfile/setup.sh index 4f1b3ae5ea5..86cb9b33491 100644 --- a/bin/tests/system/masterfile/setup.sh +++ b/bin/tests/system/masterfile/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 diff --git a/bin/tests/system/masterfile/tests.sh b/bin/tests/system/masterfile/tests.sh index 2c3ebc3deba..3e57f5f80d2 100644 --- a/bin/tests/system/masterfile/tests.sh +++ b/bin/tests/system/masterfile/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="-p ${PORT}" diff --git a/bin/tests/system/masterformat/ns1/compile.sh b/bin/tests/system/masterformat/ns1/compile.sh index 1340343e6af..d29879a5791 100755 --- a/bin/tests/system/masterformat/ns1/compile.sh +++ b/bin/tests/system/masterformat/ns1/compile.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh $CHECKZONE -D -F raw -o example.db.raw example \ example.db > /dev/null 2>&1 diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh index c1530f892be..a104cfd0338 100755 --- a/bin/tests/system/masterformat/setup.sh +++ b/bin/tests/system/masterformat/setup.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh $SHELL clean.sh diff --git a/bin/tests/system/masterformat/tests.sh b/bin/tests/system/masterformat/tests.sh index 05ff3e659b0..a7cf0190f11 100755 --- a/bin/tests/system/masterformat/tests.sh +++ b/bin/tests/system/masterformat/tests.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh status=0 n=1 @@ -88,7 +88,7 @@ dig_with_opts() { } rndccmd() { - "$RNDC" -c "$SYSTEMTESTTOP/common/rndc.conf" -p "${CONTROLPORT}" -s "$@" + "$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@" } status=0 @@ -234,7 +234,7 @@ grep "added text" "dig.out.dynamic1.ns3.test$n" > /dev/null 2>&1 || ret=1 dig_with_opts +comm @10.53.0.3 added.dynamic txt > "dig.out.dynamic2.ns3.test$n" grep "NXDOMAIN" "dig.out.dynamic2.ns3.test$n" > /dev/null 2>&1 || ret=1 # using "rndc halt" ensures that we don't dump the zone file -$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --halt --port ${CONTROLPORT} rndc ns3 +$PERL ../stop.pl --use-rndc --halt --port ${CONTROLPORT} rndc ns3 restart check_added_text() { dig_with_opts @10.53.0.3 newtext.dynamic txt > "dig.out.dynamic3.ns3.test$n" || return 1 @@ -259,7 +259,7 @@ END dig_with_opts @10.53.0.3 moretext.dynamic txt > "dig.out.dynamic1.ns3.test$n" grep "more text" "dig.out.dynamic1.ns3.test$n" > /dev/null 2>&1 || ret=1 # using "rndc stop" will cause the zone file to flush before shutdown -$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} rndc ns3 +$PERL ../stop.pl --use-rndc --port ${CONTROLPORT} rndc ns3 rm ns3/*.jnl restart #shellcheck disable=SC2034 diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh index 7d3c46e01ea..2433e797ec2 100644 --- a/bin/tests/system/metadata/setup.sh +++ b/bin/tests/system/metadata/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 pzone=parent.nil czone=child.parent.nil diff --git a/bin/tests/system/metadata/tests.sh b/bin/tests/system/metadata/tests.sh index 9d4c843eaba..0c4394ae051 100644 --- a/bin/tests/system/metadata/tests.sh +++ b/bin/tests/system/metadata/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 pzone=parent.nil pfile=parent.db czone=child.parent.nil cfile=child.db diff --git a/bin/tests/system/mirror/ns1/sign.sh b/bin/tests/system/mirror/ns1/sign.sh index 7487049a270..08f6c1efbf8 100644 --- a/bin/tests/system/mirror/ns1/sign.sh +++ b/bin/tests/system/mirror/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 ( cd ../ns2 && $SHELL -e sign.sh ) diff --git a/bin/tests/system/mirror/ns2/sign.sh b/bin/tests/system/mirror/ns2/sign.sh index 29be15b93e9..7d6cbf6c68d 100644 --- a/bin/tests/system/mirror/ns2/sign.sh +++ b/bin/tests/system/mirror/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 keys_to_trust="" diff --git a/bin/tests/system/mirror/setup.sh b/bin/tests/system/mirror/setup.sh index 4141130fd31..c80faeb7108 100644 --- a/bin/tests/system/mirror/setup.sh +++ b/bin/tests/system/mirror/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 diff --git a/bin/tests/system/mirror/tests.sh b/bin/tests/system/mirror/tests.sh index a62767b0797..80038efccf2 100644 --- a/bin/tests/system/mirror/tests.sh +++ b/bin/tests/system/mirror/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} -b 10.53.0.1 +dnssec +time=2 +tries=1 +multi" -RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" # Wait until the transfer of the given zone to ns3 either completes # successfully or is aborted by a verification failure or a REFUSED response diff --git a/bin/tests/system/mkeys/ns1/sign.sh b/bin/tests/system/mkeys/ns1/sign.sh index f640a6e86c0..7200f5c0fcc 100644 --- a/bin/tests/system/mkeys/ns1/sign.sh +++ b/bin/tests/system/mkeys/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=. zonefile=root.db diff --git a/bin/tests/system/mkeys/ns6/setup.sh b/bin/tests/system/mkeys/ns6/setup.sh index c2ef857d58c..18eeb24da61 100644 --- a/bin/tests/system/mkeys/ns6/setup.sh +++ b/bin/tests/system/mkeys/ns6/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 zone=. zonefile=root.db diff --git a/bin/tests/system/mkeys/setup.sh b/bin/tests/system/mkeys/setup.sh index 8341bcdb453..3e3da8c36f2 100644 --- a/bin/tests/system/mkeys/setup.sh +++ b/bin/tests/system/mkeys/setup.sh @@ -9,7 +9,9 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. -. $SYSTEMTESTTOP/conf.sh +echo mkeys_beg +. ../conf.sh +echo mkeys_end copy_setports ns1/named1.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf diff --git a/bin/tests/system/mkeys/tests.sh b/bin/tests/system/mkeys/tests.sh index 4b0a1e0f8da..46dfe7203b4 100644 --- a/bin/tests/system/mkeys/tests.sh +++ b/bin/tests/system/mkeys/tests.sh @@ -12,7 +12,7 @@ set -e #shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh dig_with_opts() ( "$DIG" +tcp +noadd +nosea +nostat +nocmd +dnssec -p "${PORT}" "$@" @@ -23,7 +23,7 @@ delv_with_opts() ( ) rndccmd() ( - "$RNDC" -c "$SYSTEMTESTTOP/common/rndc.conf" -p "${CONTROLPORT}" -s "$@" + "$RNDC" -c ../common/rndc.conf -p "${CONTROLPORT}" -s "$@" ) mkeys_reconfig_on() ( diff --git a/bin/tests/system/names/setup.sh b/bin/tests/system/names/setup.sh index 86e4e435490..ae101a1109a 100644 --- a/bin/tests/system/names/setup.sh +++ b/bin/tests/system/names/setup.sh @@ -7,6 +7,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 diff --git a/bin/tests/system/names/tests.sh b/bin/tests/system/names/tests.sh index 62046b346e9..6dbd6b999ad 100644 --- a/bin/tests/system/names/tests.sh +++ b/bin/tests/system/names/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="+nosea +stat +noquest +nocomm +nocmd -p ${PORT}" diff --git a/bin/tests/system/notify/setup.sh b/bin/tests/system/notify/setup.sh index c371293d706..dc4d3f5a63d 100644 --- a/bin/tests/system/notify/setup.sh +++ b/bin/tests/system/notify/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 diff --git a/bin/tests/system/notify/tests.sh b/bin/tests/system/notify/tests.sh index 151f4f5875b..63583120992 100644 --- a/bin/tests/system/notify/tests.sh +++ b/bin/tests/system/notify/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 n=0 diff --git a/bin/tests/system/nslookup/setup.sh b/bin/tests/system/nslookup/setup.sh index e7a21a6da13..1b0cf15cc75 100644 --- a/bin/tests/system/nslookup/setup.sh +++ b/bin/tests/system/nslookup/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 diff --git a/bin/tests/system/nslookup/tests.sh b/bin/tests/system/nslookup/tests.sh index a055bc4b070..c1faac5dc5e 100644 --- a/bin/tests/system/nslookup/tests.sh +++ b/bin/tests/system/nslookup/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 diff --git a/bin/tests/system/nsupdate/ns3/sign.sh b/bin/tests/system/nsupdate/ns3/sign.sh index 02dd6deda00..eb7dad65558 100644 --- a/bin/tests/system/nsupdate/ns3/sign.sh +++ b/bin/tests/system/nsupdate/ns3/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=nsec3param.test. infile=nsec3param.test.db.in diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh index 2c73a45a9b4..b19d9083c54 100644 --- a/bin/tests/system/nsupdate/setup.sh +++ b/bin/tests/system/nsupdate/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 # # jnl and database files MUST be removed before we start diff --git a/bin/tests/system/nsupdate/tests.sh b/bin/tests/system/nsupdate/tests.sh index 8afa71cd903..ceb5782b6b8 100755 --- a/bin/tests/system/nsupdate/tests.sh +++ b/bin/tests/system/nsupdate/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" # # Uncomment when creating credential cache files. @@ -515,7 +515,7 @@ update add updated4.example.nil. 600 A 10.10.10.3 send END sleep 3 -$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} nsupdate ns1 +$PERL ../stop.pl --use-rndc --port ${CONTROLPORT} nsupdate ns1 sleep 3 # Removing the journal file and restarting the server means # that the data served by the new server process are exactly diff --git a/bin/tests/system/nzd2nzf/setup.sh b/bin/tests/system/nzd2nzf/setup.sh index 0f5767dcebb..7b8f53bfd5e 100644 --- a/bin/tests/system/nzd2nzf/setup.sh +++ b/bin/tests/system/nzd2nzf/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 diff --git a/bin/tests/system/nzd2nzf/tests.sh b/bin/tests/system/nzd2nzf/tests.sh index c9c17acb71c..d4cf213cfdf 100644 --- a/bin/tests/system/nzd2nzf/tests.sh +++ b/bin/tests/system/nzd2nzf/tests.sh @@ -7,14 +7,14 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. -. $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 "$@" } status=0 @@ -43,7 +43,7 @@ if [ $ret != 0 ]; then echo_i "failed"; fi status=$((status+ret)) echo_i "stopping ns1" -$PERL $SYSTEMTESTTOP/stop.pl nzd2nzf ns1 +$PERL ../stop.pl nzd2nzf ns1 n=$((n+1)) echo_i "dumping _default.nzd to _default.nzf ($n)" diff --git a/bin/tests/system/padding/setup.sh b/bin/tests/system/padding/setup.sh index a968818c78f..234c4529257 100644 --- a/bin/tests/system/padding/setup.sh +++ b/bin/tests/system/padding/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 diff --git a/bin/tests/system/padding/tests.sh b/bin/tests/system/padding/tests.sh index 4815bf954ae..9a3aa11e856 100644 --- a/bin/tests/system/padding/tests.sh +++ b/bin/tests/system/padding/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 n=0 status=0 DIGOPTS="-p ${PORT}" -RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" getcookie() { awk '$2 == "COOKIE:" { diff --git a/bin/tests/system/pending/ns1/sign.sh b/bin/tests/system/pending/ns1/sign.sh index d63fa0371c6..707c79526fd 100644 --- a/bin/tests/system/pending/ns1/sign.sh +++ b/bin/tests/system/pending/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 diff --git a/bin/tests/system/pending/ns2/sign.sh b/bin/tests/system/pending/ns2/sign.sh index 0d8baf3a3a6..38acf401692 100644 --- a/bin/tests/system/pending/ns2/sign.sh +++ b/bin/tests/system/pending/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 for domain in example example.com; do zone=${domain}. diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh index 183fcc36ec4..11371c7d2d0 100644 --- a/bin/tests/system/pending/setup.sh +++ b/bin/tests/system/pending/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 diff --git a/bin/tests/system/pending/tests.sh b/bin/tests/system/pending/tests.sh index 529ea1bf34c..dc06dd4c585 100644 --- a/bin/tests/system/pending/tests.sh +++ b/bin/tests/system/pending/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 # replace_data dname RR old_data new_data replace_data() diff --git a/bin/tests/system/pipelined/setup.sh b/bin/tests/system/pipelined/setup.sh index 64eb4ef2ad9..f1f1d4af377 100644 --- a/bin/tests/system/pipelined/setup.sh +++ b/bin/tests/system/pipelined/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 diff --git a/bin/tests/system/pipelined/tests.sh b/bin/tests/system/pipelined/tests.sh index 3f3468004ab..be2b469a228 100644 --- a/bin/tests/system/pipelined/tests.sh +++ b/bin/tests/system/pipelined/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 MDIGOPTS="-p ${PORT}" -RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" status=0 diff --git a/bin/tests/system/pkcs11/setup.sh b/bin/tests/system/pkcs11/setup.sh index bc85fc75d06..5de6f4a17ed 100644 --- a/bin/tests/system/pkcs11/setup.sh +++ b/bin/tests/system/pkcs11/setup.sh @@ -12,7 +12,7 @@ set -eu # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh echo_i "Generating keys for Native PKCS#11" >&2 @@ -63,7 +63,7 @@ for algbits in rsasha256:2048 rsasha512:2048 ecdsap256sha256:256 ecdsap384sha384 bits=$(echo "$algbits" | cut -f 2 -d :) zone="$alg.example" zonefile="ns1/$alg.example.db" - if $SHELL "$SYSTEMTESTTOP/testcrypto.sh" "$alg"; then + if $SHELL ../testcrypto.sh "$alg"; then echo "$alg" >> supported algs="$algs$alg " diff --git a/bin/tests/system/pkcs11/tests.sh b/bin/tests/system/pkcs11/tests.sh index 98b33c08f1a..70962ceae02 100644 --- a/bin/tests/system/pkcs11/tests.sh +++ b/bin/tests/system/pkcs11/tests.sh @@ -12,7 +12,7 @@ set -e # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh count_rrsigs() ( grep -c "IN[[:space:]]*RRSIG" "$@" || true diff --git a/bin/tests/system/qmin/setup.sh b/bin/tests/system/qmin/setup.sh index 0ad125d62b0..8484b8ede56 100644 --- a/bin/tests/system/qmin/setup.sh +++ b/bin/tests/system/qmin/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 ns5/named.conf.in ns5/named.conf diff --git a/bin/tests/system/qmin/tests.sh b/bin/tests/system/qmin/tests.sh index afb73603d97..59c06e9bbf9 100755 --- a/bin/tests/system/qmin/tests.sh +++ b/bin/tests/system/qmin/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" CLEANQL="rm -f ans*/query.log" status=0 n=0 diff --git a/bin/tests/system/reclimit/setup.sh b/bin/tests/system/reclimit/setup.sh index c80a5c79a3b..166f30617a4 100644 --- a/bin/tests/system/reclimit/setup.sh +++ b/bin/tests/system/reclimit/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 ns3/named1.conf.in ns3/named.conf diff --git a/bin/tests/system/reclimit/tests.sh b/bin/tests/system/reclimit/tests.sh index 9ee737ec5be..890ea6cf687 100644 --- a/bin/tests/system/reclimit/tests.sh +++ b/bin/tests/system/reclimit/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="-p ${PORT}" diff --git a/bin/tests/system/redirect/ns1/sign.sh b/bin/tests/system/redirect/ns1/sign.sh index cf295c42e8b..820639529e6 100644 --- a/bin/tests/system/redirect/ns1/sign.sh +++ b/bin/tests/system/redirect/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 diff --git a/bin/tests/system/redirect/ns3/sign.sh b/bin/tests/system/redirect/ns3/sign.sh index cf295c42e8b..820639529e6 100644 --- a/bin/tests/system/redirect/ns3/sign.sh +++ b/bin/tests/system/redirect/ns3/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 diff --git a/bin/tests/system/redirect/ns5/sign.sh b/bin/tests/system/redirect/ns5/sign.sh index 2236dfc9316..ca5340e4695 100644 --- a/bin/tests/system/redirect/ns5/sign.sh +++ b/bin/tests/system/redirect/ns5/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 # We sign the zone here and move the signed zone to ns6. # The ns5 server actually does not serve this zone but diff --git a/bin/tests/system/redirect/setup.sh b/bin/tests/system/redirect/setup.sh index 3b35510a2fb..43750679720 100644 --- a/bin/tests/system/redirect/setup.sh +++ b/bin/tests/system/redirect/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 diff --git a/bin/tests/system/redirect/tests.sh b/bin/tests/system/redirect/tests.sh index e720db3b1ea..5d085904646 100644 --- a/bin/tests/system/redirect/tests.sh +++ b/bin/tests/system/redirect/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 @@ -17,7 +17,7 @@ n=1 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 diff --git a/bin/tests/system/resolver/ns6/keygen.sh b/bin/tests/system/resolver/ns6/keygen.sh index 5b6ad516d7a..ad225ec17d4 100644 --- a/bin/tests/system/resolver/ns6/keygen.sh +++ b/bin/tests/system/resolver/ns6/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=ds.example.net zonefile="${zone}.db" diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh index cf1f0f45911..dfa3e38575d 100644 --- a/bin/tests/system/resolver/setup.sh +++ b/bin/tests/system/resolver/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 ns4/tld1.db ns4/tld.db cp ns6/to-be-removed.tld.db.in ns6/to-be-removed.tld.db diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh index e9469ca27b2..999c2c373cb 100755 --- a/bin/tests/system/resolver/tests.sh +++ b/bin/tests/system/resolver/tests.sh @@ -9,12 +9,12 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh echo . DIGOPTS="-p ${PORT}" RESOLVOPTS="-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 diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh index c15ac085fb0..7a8160e1ff9 100644 --- a/bin/tests/system/rndc/setup.sh +++ b/bin/tests/system/rndc/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 ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 >ns2/nil.db $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 >ns2/other.db diff --git a/bin/tests/system/rndc/tests.sh b/bin/tests/system/rndc/tests.sh index d3fc9bef30d..7142e645d48 100644 --- a/bin/tests/system/rndc/tests.sh +++ b/bin/tests/system/rndc/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 +noadd +nosea +nostat +noquest +nocomm +nocmd" DIGCMD="$DIG $DIGOPTS @10.53.0.2 -p ${PORT}" diff --git a/bin/tests/system/rootkeysentinel/ns1/sign.sh b/bin/tests/system/rootkeysentinel/ns1/sign.sh index 340e02407f7..cf1ca16bf38 100644 --- a/bin/tests/system/rootkeysentinel/ns1/sign.sh +++ b/bin/tests/system/rootkeysentinel/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 diff --git a/bin/tests/system/rootkeysentinel/ns2/sign.sh b/bin/tests/system/rootkeysentinel/ns2/sign.sh index e847ac33feb..fa03c900a3a 100644 --- a/bin/tests/system/rootkeysentinel/ns2/sign.sh +++ b/bin/tests/system/rootkeysentinel/ns2/sign.sh @@ -15,7 +15,7 @@ newid=`expr "0000${newid}" : '.*\(.....\)$'` badid=`expr \( ${oldid} + 7777 \) % 65536` badid=`expr "0000${badid}" : '.*\(.....\)$'` -. $SYSTEMTESTTOP/conf.sh +. ../../conf.sh zone=example. infile=example.db.in diff --git a/bin/tests/system/rootkeysentinel/setup.sh b/bin/tests/system/rootkeysentinel/setup.sh index 43b159c8c7e..b758a31d044 100644 --- a/bin/tests/system/rootkeysentinel/setup.sh +++ b/bin/tests/system/rootkeysentinel/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 diff --git a/bin/tests/system/rootkeysentinel/tests.sh b/bin/tests/system/rootkeysentinel/tests.sh index 8aa5ba8d913..9b416df8410 100644 --- a/bin/tests/system/rootkeysentinel/tests.sh +++ b/bin/tests/system/rootkeysentinel/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 diff --git a/bin/tests/system/rpz/ckdnsrps.sh b/bin/tests/system/rpz/ckdnsrps.sh index adb8f7da9bd..fd0287a1723 100644 --- a/bin/tests/system/rpz/ckdnsrps.sh +++ b/bin/tests/system/rpz/ckdnsrps.sh @@ -17,7 +17,7 @@ set -e # and differ from dnsrpz.conf which is used by dnsrpzd. -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh DNSRPS_CMD=../rpz/dnsrps diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh index 2ad1d44513d..64146a4a6ea 100644 --- a/bin/tests/system/rpz/setup.sh +++ b/bin/tests/system/rpz/setup.sh @@ -13,7 +13,7 @@ set -e -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh QPERF=`$SHELL qperf.sh` diff --git a/bin/tests/system/rpz/tests.sh b/bin/tests/system/rpz/tests.sh index 4edd5f51371..9ede495d70d 100644 --- a/bin/tests/system/rpz/tests.sh +++ b/bin/tests/system/rpz/tests.sh @@ -14,7 +14,7 @@ # touch dnsrps-off to not test with DNSRPS # touch dnsrps-only to not test with classic RPZ -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh ns=10.53.0 ns1=$ns.1 # root, defining the others @@ -60,7 +60,7 @@ comment () { } DNSRPSCMD=./dnsrps -RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" if test -x $DNSRPSCMD; then # speed up the many delays for dnsrpzd by waiting only 0.1 seconds @@ -320,7 +320,7 @@ ckresult () { elif grep "flags:.* aa .*ad;" $DIGNM; then setret "'dig $1' AD set;" fi - if $PERL $SYSTEMTESTTOP/digcomp.pl $DIGNM $2 >/dev/null; then + if $PERL ../digcomp.pl $DIGNM $2 >/dev/null; then NEED_TCP=`echo "$1" | sed -n -e 's/[Tt][Cc][Pp].*/TCP/p'` RESULT_TCP=`sed -n -e 's/.*Truncated, retrying in TCP.*/TCP/p' $DIGNM` if test "$NEED_TCP" != "$RESULT_TCP"; then @@ -467,7 +467,7 @@ for mode in native dnsrps; do continue fi echo_i "attempting to configure servers with DNSRPS..." - $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} rpz + $PERL ../stop.pl --use-rndc --port ${CONTROLPORT} rpz $SHELL ./setup.sh -N -D $DEBUG for server in ns*; do resetstats $server @@ -785,7 +785,7 @@ EOF # restart the main test RPZ server to see if that creates a core file if test -z "$HAVE_CORE"; then - $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} rpz ns3 + $PERL ../stop.pl --use-rndc --port ${CONTROLPORT} rpz ns3 restart 3 "rebuild-bl-rpz" HAVE_CORE=`find ns* -name '*core*' -print` test -z "$HAVE_CORE" || setret "found $HAVE_CORE; memory leak?" @@ -805,11 +805,11 @@ EOF # restart the main test RPZ server with a bad zone. t=`expr $t + 1` echo_i "checking that ns3 with broken rpz does not crash (${t})" - $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} rpz ns3 + $PERL ../stop.pl --use-rndc --port ${CONTROLPORT} rpz ns3 cp ns3/broken.db.in ns3/bl.db restart 3 # do not rebuild rpz zones nocrash a3-1.tld2 -tA - $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} rpz ns3 + $PERL ../stop.pl --use-rndc --port ${CONTROLPORT} rpz ns3 restart 3 "rebuild-bl-rpz" # reload a RPZ zone that is now deliberately broken. diff --git a/bin/tests/system/rpzextra/setup.sh b/bin/tests/system/rpzextra/setup.sh index 1c0d9b9d491..762e2208b86 100644 --- a/bin/tests/system/rpzextra/setup.sh +++ b/bin/tests/system/rpzextra/setup.sh @@ -13,8 +13,7 @@ set -e -SYSTEMTESTTOP=.. -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf diff --git a/bin/tests/system/rpzrecurse/setup.sh b/bin/tests/system/rpzrecurse/setup.sh index 267f5dc21b9..44c46f051f4 100644 --- a/bin/tests/system/rpzrecurse/setup.sh +++ b/bin/tests/system/rpzrecurse/setup.sh @@ -13,7 +13,7 @@ set -e -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh USAGE="$0: [-DNx]" DEBUG= diff --git a/bin/tests/system/rpzrecurse/tests.sh b/bin/tests/system/rpzrecurse/tests.sh index 43b2b4a50ac..a8436c41f74 100644 --- a/bin/tests/system/rpzrecurse/tests.sh +++ b/bin/tests/system/rpzrecurse/tests.sh @@ -12,7 +12,7 @@ # touch dnsrps-off to not test with DNSRPS # touch dnsrps-only to not test with classic RPZ -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh status=0 @@ -38,14 +38,14 @@ fi trap 'exit 1' 1 2 15 DNSRPSCMD=../rpz/dnsrps -RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" # $1 = test name (such as 1a, 1b, etc. for which named.$1.conf exists) run_server() { TESTNAME=$1 echo_i "stopping resolver" - $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} rpzrecurse ns2 + $PERL ../stop.pl --use-rndc --port ${CONTROLPORT} rpzrecurse ns2 sleep 1 @@ -121,7 +121,7 @@ for mode in native dnsrps; do continue fi echo_i "attempting to configure servers with DNSRPS..." - $PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} rpzrecurse + $PERL ../stop.pl --use-rndc --port ${CONTROLPORT} rpzrecurse $SHELL ./setup.sh -N -D $DEBUG sed -n 's/^## //p' dnsrps.conf | cat_i if grep '^#fail' dnsrps.conf >/dev/null; then diff --git a/bin/tests/system/rrchecker/tests.sh b/bin/tests/system/rrchecker/tests.sh index e5b4fe84cc6..13f46ae2309 100644 --- a/bin/tests/system/rrchecker/tests.sh +++ b/bin/tests/system/rrchecker/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 diff --git a/bin/tests/system/rrl/setup.sh b/bin/tests/system/rrl/setup.sh index 64eb4ef2ad9..f1f1d4af377 100644 --- a/bin/tests/system/rrl/setup.sh +++ b/bin/tests/system/rrl/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 diff --git a/bin/tests/system/rrl/tests.sh b/bin/tests/system/rrl/tests.sh index dd526d7b2c5..b415a17ffde 100644 --- a/bin/tests/system/rrl/tests.sh +++ b/bin/tests/system/rrl/tests.sh @@ -9,9 +9,9 @@ # test response rate limiting -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh -RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" #set -x diff --git a/bin/tests/system/rrsetorder/setup.sh b/bin/tests/system/rrsetorder/setup.sh index f3c0bd35198..6ecdf0282e6 100644 --- a/bin/tests/system/rrsetorder/setup.sh +++ b/bin/tests/system/rrsetorder/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 diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh index a3450f1a385..f221ddb205a 100644 --- a/bin/tests/system/rrsetorder/tests.sh +++ b/bin/tests/system/rrsetorder/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="+nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short +nocookie" DIGCMD="$DIG $DIGOPTS -p ${PORT}" diff --git a/bin/tests/system/rsabigexponent/ns1/sign.sh b/bin/tests/system/rsabigexponent/ns1/sign.sh index a50cb407673..614a8ec4753 100755 --- a/bin/tests/system/rsabigexponent/ns1/sign.sh +++ b/bin/tests/system/rsabigexponent/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 diff --git a/bin/tests/system/rsabigexponent/ns2/sign.sh b/bin/tests/system/rsabigexponent/ns2/sign.sh index 82e51c61f75..7e6ca13f771 100755 --- a/bin/tests/system/rsabigexponent/ns2/sign.sh +++ b/bin/tests/system/rsabigexponent/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. infile=example.db.in diff --git a/bin/tests/system/rsabigexponent/setup.sh b/bin/tests/system/rsabigexponent/setup.sh index 1c6233eac04..88e881a1774 100644 --- a/bin/tests/system/rsabigexponent/setup.sh +++ b/bin/tests/system/rsabigexponent/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 diff --git a/bin/tests/system/rsabigexponent/tests.sh b/bin/tests/system/rsabigexponent/tests.sh index 80b618b9235..f5d00891cb5 100644 --- a/bin/tests/system/rsabigexponent/tests.sh +++ b/bin/tests/system/rsabigexponent/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 diff --git a/bin/tests/system/run.sh.in b/bin/tests/system/run.sh.in index 1a04a9ae0d3..c59a3e2cfdc 100644 --- a/bin/tests/system/run.sh.in +++ b/bin/tests/system/run.sh.in @@ -25,12 +25,6 @@ if [ "$(id -u)" -eq "0" ] && [ "@DEVELOPER_MODE@" != "yes" ]; then exit 1 fi -SYSTEMTESTTOP="$(cd -P -- "${builddir}" && pwd -P)" -if [ "$CYGWIN" ]; then - SYSTEMTESTTOP="$(cygpath -m "${SYSTEMTESTTOP}")" -fi - -export SYSTEMTESTTOP export builddir export srcdir @@ -97,6 +91,12 @@ if [ "${srcdir}" != "${builddir}" ]; then if [ ! -d common ] || [ ! -r common/.prepared ]; then cp -a "${srcdir}/common" "${builddir}" fi + # Some tests require additional files to work for out-of-tree test runs. + for file in ckdnsrps.sh digcomp.pl ditch.pl packet.pl start.pl stop.pl; do + if [ ! -r "${file}" ]; then + cp -a "${srcdir}/${file}" "${builddir}" + fi + done if [ ! -d "$systest" ] || [ ! -r "$systest/.prepared" ]; then mkdir -p "${builddir}/$systest" cp -a "${srcdir}/$systest" "${builddir}/" diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh index 5f20e166698..2f0c3a3dbc1 100755 --- a/bin/tests/system/runall.sh +++ b/bin/tests/system/runall.sh @@ -24,8 +24,7 @@ # (This is ignored when running on Windows as the tests are always # run sequentially on that platform.) -SYSTEMTESTTOP=. -. "$SYSTEMTESTTOP/conf.sh" +. ./conf.sh usage="Usage: ./runall.sh [-c] [-n] [numprocesses]" diff --git a/bin/tests/system/runsequential.sh b/bin/tests/system/runsequential.sh index f3f168e4792..4f01a63c0b2 100755 --- a/bin/tests/system/runsequential.sh +++ b/bin/tests/system/runsequential.sh @@ -16,8 +16,7 @@ # is the only one running on an IP address. # -SYSTEMTESTTOP=. -. "$SYSTEMTESTTOP/conf.sh" +. ./conf.sh for d in $SEQUENTIALDIRS do diff --git a/bin/tests/system/runtime/setup.sh b/bin/tests/system/runtime/setup.sh index c759fc6c5a8..8721f12273c 100644 --- a/bin/tests/system/runtime/setup.sh +++ b/bin/tests/system/runtime/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 diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh index f46924acdd5..9e63d77a91a 100644 --- a/bin/tests/system/runtime/tests.sh +++ b/bin/tests/system/runtime/tests.sh @@ -10,11 +10,11 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh set -e -RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" kill_named() { pidfile="${1}" diff --git a/bin/tests/system/serve-stale/setup.sh b/bin/tests/system/serve-stale/setup.sh index f0ac9e60f73..963278e9761 100644 --- a/bin/tests/system/serve-stale/setup.sh +++ b/bin/tests/system/serve-stale/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 diff --git a/bin/tests/system/serve-stale/tests.sh b/bin/tests/system/serve-stale/tests.sh index c85fcfe28a3..7c9de93bdda 100755 --- a/bin/tests/system/serve-stale/tests.sh +++ b/bin/tests/system/serve-stale/tests.sh @@ -9,9 +9,9 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh -RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" # wait up to ten seconds to ensure that a file has been written waitfile () { @@ -1037,7 +1037,7 @@ status=$((status+ret)) if [ $ret != 0 ]; then echo_i "failed"; fi echo_i "stop ns4" -$PERL $SYSTEMTESTTOP/stop.pl --use-rndc --port ${CONTROLPORT} serve-stale ns4 +$PERL ../stop.pl --use-rndc --port ${CONTROLPORT} serve-stale ns4 # Load the cache as if it was five minutes (RBTDB_VIRTUAL) older. # Since max-stale-ttl defaults to a week, we need to adjust the date by diff --git a/bin/tests/system/setup.sh b/bin/tests/system/setup.sh index ff8c1bd2aa4..0dd67c9af57 100644 --- a/bin/tests/system/setup.sh +++ b/bin/tests/system/setup.sh @@ -13,8 +13,7 @@ # Run a system test. # -SYSTEMTESTTOP=. -. $SYSTEMTESTTOP/conf.sh +. ./conf.sh test $# -gt 0 || { echo "usage: $0 test-directory" >&2; exit 1; } diff --git a/bin/tests/system/sfcache/ns1/sign.sh b/bin/tests/system/sfcache/ns1/sign.sh index 7e5b2b3beda..2ae6153e988 100644 --- a/bin/tests/system/sfcache/ns1/sign.sh +++ b/bin/tests/system/sfcache/ns1/sign.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh set -e diff --git a/bin/tests/system/sfcache/ns2/sign.sh b/bin/tests/system/sfcache/ns2/sign.sh index 11f866abb27..5d1a4ecbd53 100644 --- a/bin/tests/system/sfcache/ns2/sign.sh +++ b/bin/tests/system/sfcache/ns2/sign.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh set -e diff --git a/bin/tests/system/sfcache/ns5/sign.sh b/bin/tests/system/sfcache/ns5/sign.sh index 82b43018045..026e0119aed 100644 --- a/bin/tests/system/sfcache/ns5/sign.sh +++ b/bin/tests/system/sfcache/ns5/sign.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh set -e diff --git a/bin/tests/system/sfcache/setup.sh b/bin/tests/system/sfcache/setup.sh index ec795d2d609..53311f5470d 100644 --- a/bin/tests/system/sfcache/setup.sh +++ b/bin/tests/system/sfcache/setup.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh set -e diff --git a/bin/tests/system/sfcache/tests.sh b/bin/tests/system/sfcache/tests.sh index 51e2da14306..09ecfb8dc55 100644 --- a/bin/tests/system/sfcache/tests.sh +++ b/bin/tests/system/sfcache/tests.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh set -e @@ -24,7 +24,7 @@ dig_with_opts() { } rndc_with_opts() { - "$RNDC" -c "$SYSTEMTESTTOP/common/rndc.conf" -p "$CONTROLPORT" -s "$@" + "$RNDC" -c ../common/rndc.conf -p "$CONTROLPORT" -s "$@" } echo_i "checking DNSSEC SERVFAIL is cached ($n)" diff --git a/bin/tests/system/shutdown/setup.sh b/bin/tests/system/shutdown/setup.sh index a5a30d57df2..7bf6072070c 100644 --- a/bin/tests/system/shutdown/setup.sh +++ b/bin/tests/system/shutdown/setup.sh @@ -13,8 +13,7 @@ set -e -SYSTEMTESTTOP=.. -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf diff --git a/bin/tests/system/shutdown/tests-shutdown.py b/bin/tests/system/shutdown/tests-shutdown.py index 69eefd11ce6..623aa29fd40 100755 --- a/bin/tests/system/shutdown/tests-shutdown.py +++ b/bin/tests/system/shutdown/tests-shutdown.py @@ -140,11 +140,8 @@ def test_named_shutdown(named_port, control_port): rndc = os.getenv("RNDC") assert rndc is not None - systest_dir = os.getenv("SYSTEMTESTTOP") - assert systest_dir is not None - - # rndc configuration resides in $SYSTEMTESTTOP/common/rndc.conf - rndc_cfg = os.path.join(systest_dir, "common", "rndc.conf") + # rndc configuration resides in ../common/rndc.conf + rndc_cfg = os.path.join("..", "common", "rndc.conf") assert os.path.isfile(rndc_cfg) # rndc command with default arguments. diff --git a/bin/tests/system/smartsign/tests.sh b/bin/tests/system/smartsign/tests.sh index c08c1f1b747..e09e8856cbc 100644 --- a/bin/tests/system/smartsign/tests.sh +++ b/bin/tests/system/smartsign/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 diff --git a/bin/tests/system/sortlist/setup.sh b/bin/tests/system/sortlist/setup.sh index 0f5767dcebb..7b8f53bfd5e 100644 --- a/bin/tests/system/sortlist/setup.sh +++ b/bin/tests/system/sortlist/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 diff --git a/bin/tests/system/sortlist/tests.sh b/bin/tests/system/sortlist/tests.sh index a20dc3f66ca..6cda1a3f3d1 100644 --- a/bin/tests/system/sortlist/tests.sh +++ b/bin/tests/system/sortlist/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 +noadd +nosea +nostat +noquest +noauth +nocomm +nocmd -p ${PORT}" diff --git a/bin/tests/system/spf/setup.sh b/bin/tests/system/spf/setup.sh index 0f5767dcebb..7b8f53bfd5e 100644 --- a/bin/tests/system/spf/setup.sh +++ b/bin/tests/system/spf/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 diff --git a/bin/tests/system/spf/tests.sh b/bin/tests/system/spf/tests.sh index 27af97a3568..bafbb431cba 100644 --- a/bin/tests/system/spf/tests.sh +++ b/bin/tests/system/spf/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 n=1 status=0 diff --git a/bin/tests/system/staticstub/ns3/sign.sh b/bin/tests/system/staticstub/ns3/sign.sh index cd7e13f2f47..b76e43fa978 100755 --- a/bin/tests/system/staticstub/ns3/sign.sh +++ b/bin/tests/system/staticstub/ns3/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. infile=example.db.in diff --git a/bin/tests/system/staticstub/ns4/sign.sh b/bin/tests/system/staticstub/ns4/sign.sh index 2f5dbf05ab5..fd01039b8e7 100755 --- a/bin/tests/system/staticstub/ns4/sign.sh +++ b/bin/tests/system/staticstub/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 zone=sub.example infile=${zone}.db.in diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh index b2af6098912..a127b2fd350 100755 --- a/bin/tests/system/staticstub/setup.sh +++ b/bin/tests/system/staticstub/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 tmp diff --git a/bin/tests/system/staticstub/tests.sh b/bin/tests/system/staticstub/tests.sh index e487ff298c5..0a8e26a2bc6 100755 --- a/bin/tests/system/staticstub/tests.sh +++ b/bin/tests/system/staticstub/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 diff --git a/bin/tests/system/statistics/setup.sh b/bin/tests/system/statistics/setup.sh index e683db06d94..aadae5085b1 100644 --- a/bin/tests/system/statistics/setup.sh +++ b/bin/tests/system/statistics/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 diff --git a/bin/tests/system/statistics/tests.sh b/bin/tests/system/statistics/tests.sh index 5347ade54e5..eaa7b676bd6 100644 --- a/bin/tests/system/statistics/tests.sh +++ b/bin/tests/system/statistics/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 +noadd +nosea +nostat +noquest +nocomm +nocmd" DIGCMD="$DIG $DIGOPTS -p ${PORT}" diff --git a/bin/tests/system/statschannel/ns2/sign.sh b/bin/tests/system/statschannel/ns2/sign.sh index f772c0f2b15..8f7aa57c697 100644 --- a/bin/tests/system/statschannel/ns2/sign.sh +++ b/bin/tests/system/statschannel/ns2/sign.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh set -e diff --git a/bin/tests/system/statschannel/setup.sh b/bin/tests/system/statschannel/setup.sh index 2ce6fde81d3..b899186ce74 100644 --- a/bin/tests/system/statschannel/setup.sh +++ b/bin/tests/system/statschannel/setup.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh for conf in ns*/named.conf.in; do copy_setports "$conf" "$(dirname "$conf")/$(basename "$conf" .in)" diff --git a/bin/tests/system/statschannel/tests.sh b/bin/tests/system/statschannel/tests.sh index 8bac41fa863..0a0376d73a9 100644 --- a/bin/tests/system/statschannel/tests.sh +++ b/bin/tests/system/statschannel/tests.sh @@ -10,10 +10,10 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh DIGCMD="$DIG @10.53.0.2 -p ${PORT}" -RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" if [ ! "$HAVEJSONSTATS" ] then diff --git a/bin/tests/system/stopall.sh b/bin/tests/system/stopall.sh index d9b57e0f92e..65de1419a2a 100644 --- a/bin/tests/system/stopall.sh +++ b/bin/tests/system/stopall.sh @@ -13,8 +13,7 @@ # Stop all hanging processes from any system tests. # -SYSTEMTESTTOP=. -. $SYSTEMTESTTOP/conf.sh +. ./conf.sh for d in $SUBDIRS do diff --git a/bin/tests/system/stress/setup.sh b/bin/tests/system/stress/setup.sh index dab4b9a46fa..c34469e741b 100644 --- a/bin/tests/system/stress/setup.sh +++ b/bin/tests/system/stress/setup.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh # # Set up test data for zone transfer quota tests. diff --git a/bin/tests/system/stress/tests.sh b/bin/tests/system/stress/tests.sh index 08edd332aa5..40cb0630fae 100644 --- a/bin/tests/system/stress/tests.sh +++ b/bin/tests/system/stress/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 diff --git a/bin/tests/system/stub/setup.sh b/bin/tests/system/stub/setup.sh index e683db06d94..aadae5085b1 100644 --- a/bin/tests/system/stub/setup.sh +++ b/bin/tests/system/stub/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 diff --git a/bin/tests/system/stub/tests.sh b/bin/tests/system/stub/tests.sh index 20f2b3a24d2..71464dbe0bd 100644 --- a/bin/tests/system/stub/tests.sh +++ b/bin/tests/system/stub/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}" @@ -52,7 +52,7 @@ digcomp knowngood.dig.out.rec dig.out.ns3 || ret=1 [ $pass = 1 ] && { echo_i "stopping stub server" - $PERL $SYSTEMTESTTOP/stop.pl stub ns3 + $PERL ../stop.pl stub ns3 echo_i "re-starting stub server" start_server --noclean --restart --port ${PORT} stub ns3 diff --git a/bin/tests/system/synthfromdnssec/ns1/sign.sh b/bin/tests/system/synthfromdnssec/ns1/sign.sh index b45c577fd45..5706906b031 100644 --- a/bin/tests/system/synthfromdnssec/ns1/sign.sh +++ b/bin/tests/system/synthfromdnssec/ns1/sign.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh zone=example infile=example.db.in diff --git a/bin/tests/system/synthfromdnssec/setup.sh b/bin/tests/system/synthfromdnssec/setup.sh index fe77278c475..ddc1c0e677b 100644 --- a/bin/tests/system/synthfromdnssec/setup.sh +++ b/bin/tests/system/synthfromdnssec/setup.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh set -e diff --git a/bin/tests/system/synthfromdnssec/tests.sh b/bin/tests/system/synthfromdnssec/tests.sh index d5ea27298a7..a75921cab55 100644 --- a/bin/tests/system/synthfromdnssec/tests.sh +++ b/bin/tests/system/synthfromdnssec/tests.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh set -e diff --git a/bin/tests/system/tcp/setup.sh b/bin/tests/system/tcp/setup.sh index dc9bb97edb4..f3aae197ef7 100644 --- a/bin/tests/system/tcp/setup.sh +++ b/bin/tests/system/tcp/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 diff --git a/bin/tests/system/tcp/tests.sh b/bin/tests/system/tcp/tests.sh index a659019678e..0f4deb8e37b 100644 --- a/bin/tests/system/tcp/tests.sh +++ b/bin/tests/system/tcp/tests.sh @@ -12,7 +12,7 @@ set -e # shellcheck source=../conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh dig_with_opts() { "${DIG}" -p "${PORT}" "$@" diff --git a/bin/tests/system/testcrypto.sh b/bin/tests/system/testcrypto.sh index c4d34ad7c3c..8cb8b79ea28 100644 --- a/bin/tests/system/testcrypto.sh +++ b/bin/tests/system/testcrypto.sh @@ -9,8 +9,7 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. -SYSTEMTESTTOP=${SYSTEMTESTTOP:=..} -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh prog=$0 diff --git a/bin/tests/system/testsummary.sh b/bin/tests/system/testsummary.sh index 64a99fd4c75..dbd8684c694 100644 --- a/bin/tests/system/testsummary.sh +++ b/bin/tests/system/testsummary.sh @@ -24,8 +24,7 @@ # 0 - no tests failed # 1 - one or more tests failed -SYSTEMTESTTOP=. -. "$SYSTEMTESTTOP/conf.sh" +. ./conf.sh keepfile=0 diff --git a/bin/tests/system/tkey/ns1/setup.sh b/bin/tests/system/tkey/ns1/setup.sh index a8f43ca3007..ed81258072c 100644 --- a/bin/tests/system/tkey/ns1/setup.sh +++ b/bin/tests/system/tkey/ns1/setup.sh @@ -11,7 +11,7 @@ set -e -. "$SYSTEMTESTTOP/conf.sh" +. ../../conf.sh keyname=$($KEYGEN -T KEY -a DH -b 768 -n host server) keyid=$(keyfile_to_key_id "$keyname") diff --git a/bin/tests/system/tkey/setup.sh b/bin/tests/system/tkey/setup.sh index 014c1eb18f6..4c63bc7784b 100644 --- a/bin/tests/system/tkey/setup.sh +++ b/bin/tests/system/tkey/setup.sh @@ -11,7 +11,7 @@ set -e -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/tkey/tests.sh b/bin/tests/system/tkey/tests.sh index f7d816e3725..a48d078e5a1 100644 --- a/bin/tests/system/tkey/tests.sh +++ b/bin/tests/system/tkey/tests.sh @@ -11,7 +11,7 @@ set -e -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh dig_with_opts() { "$DIG" @10.53.0.1 -p "$PORT" "$@" diff --git a/bin/tests/system/tools/setup.sh b/bin/tests/system/tools/setup.sh index 50792327413..357727e1439 100644 --- a/bin/tests/system/tools/setup.sh +++ b/bin/tests/system/tools/setup.sh @@ -10,6 +10,6 @@ # information regarding copyright ownership. # shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh $SHELL clean.sh diff --git a/bin/tests/system/tools/tests.sh b/bin/tests/system/tools/tests.sh index f49f6eeda05..142117f23a1 100644 --- a/bin/tests/system/tools/tests.sh +++ b/bin/tests/system/tools/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 diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh index 1629d0cb715..1d4bf137615 100644 --- a/bin/tests/system/tsig/setup.sh +++ b/bin/tests/system/tsig/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 diff --git a/bin/tests/system/tsig/tests.sh b/bin/tests/system/tsig/tests.sh index 31f031ea7b3..9f23667a6ee 100644 --- a/bin/tests/system/tsig/tests.sh +++ b/bin/tests/system/tsig/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}" diff --git a/bin/tests/system/tsiggss/prereq.sh b/bin/tests/system/tsiggss/prereq.sh index b552ebdc8bb..c81e201f5c8 100644 --- a/bin/tests/system/tsiggss/prereq.sh +++ b/bin/tests/system/tsiggss/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 # enable the tsiggss test only if gssapi was enabled $FEATURETEST --gssapi || { diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh index f6623ccbf1f..308ee862287 100644 --- a/bin/tests/system/tsiggss/setup.sh +++ b/bin/tests/system/tsiggss/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 diff --git a/bin/tests/system/tsiggss/tests.sh b/bin/tests/system/tsiggss/tests.sh index 8a19050c406..f039c163788 100644 --- a/bin/tests/system/tsiggss/tests.sh +++ b/bin/tests/system/tsiggss/tests.sh @@ -11,7 +11,7 @@ # tests for TSIG-GSS updates -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh status=0 n=1 diff --git a/bin/tests/system/ttl/setup.sh b/bin/tests/system/ttl/setup.sh index 7c905f6b5ed..68fd0d2b814 100644 --- a/bin/tests/system/ttl/setup.sh +++ b/bin/tests/system/ttl/setup.sh @@ -1,6 +1,6 @@ #!/bin/sh -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh $SHELL clean.sh copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/ttl/tests.sh b/bin/tests/system/ttl/tests.sh index 54ca973f1d1..e0a3582b7f5 100644 --- a/bin/tests/system/ttl/tests.sh +++ b/bin/tests/system/ttl/tests.sh @@ -1,6 +1,6 @@ #!/bin/sh -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh dig_with_options() { "$DIG" +noadd +nosea +nostat +noquest +nocomm +nocmd -p "${PORT}" "$@"; } diff --git a/bin/tests/system/unknown/ns3/sign.sh b/bin/tests/system/unknown/ns3/sign.sh index 709e4aad14b..7fcf7bb5e13 100644 --- a/bin/tests/system/unknown/ns3/sign.sh +++ b/bin/tests/system/unknown/ns3/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 rm -f K${zone}.+*+*.key diff --git a/bin/tests/system/unknown/setup.sh b/bin/tests/system/unknown/setup.sh index 492731f9350..63dba9ac416 100644 --- a/bin/tests/system/unknown/setup.sh +++ b/bin/tests/system/unknown/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 copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf diff --git a/bin/tests/system/unknown/tests.sh b/bin/tests/system/unknown/tests.sh index b87b0ef3381..b4f3be26f19 100644 --- a/bin/tests/system/unknown/tests.sh +++ b/bin/tests/system/unknown/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 @@ -143,7 +143,7 @@ done status=`expr $status + $ret` echo_i "stop and restart secondary" -$PERL $SYSTEMTESTTOP/stop.pl unknown ns2 +$PERL ../stop.pl unknown ns2 start_server --noclean --restart --port ${PORT} unknown ns2 # server may be answering queries before zones are loaded, @@ -167,7 +167,7 @@ $DIFF large.out dig.out > /dev/null || { ret=1 ; echo_i "$DIFF failed"; } status=`expr $status + $ret` echo_i "stop and restart inline secondary" -$PERL $SYSTEMTESTTOP/stop.pl unknown ns3 +$PERL ../stop.pl unknown ns3 start_server --noclean --restart --port ${PORT} unknown ns3 # server may be answering queries before zones are loaded, diff --git a/bin/tests/system/upforwd/setup.sh b/bin/tests/system/upforwd/setup.sh index 64bb7feb701..219cc3f816b 100644 --- a/bin/tests/system/upforwd/setup.sh +++ b/bin/tests/system/upforwd/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/example1.db ns1/example.db cp -f ns3/nomaster.db ns3/nomaster1.db diff --git a/bin/tests/system/upforwd/tests.sh b/bin/tests/system/upforwd/tests.sh index a07cceeab1f..99dfab628e1 100644 --- a/bin/tests/system/upforwd/tests.sh +++ b/bin/tests/system/upforwd/tests.sh @@ -13,7 +13,7 @@ # ns2 = secondary with update forwarding disabled; not currently used # ns3 = secondary with update forwarding enabled -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh DIGOPTS="+tcp +noadd +nosea +nostat +noquest +nocomm +nocmd -p ${PORT}" diff --git a/bin/tests/system/verify/setup.sh b/bin/tests/system/verify/setup.sh index 8feca6f49d6..655754188d6 100644 --- a/bin/tests/system/verify/setup.sh +++ b/bin/tests/system/verify/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 (cd zones && $SHELL genzones.sh) diff --git a/bin/tests/system/verify/tests.sh b/bin/tests/system/verify/tests.sh index 8c852d57143..e6a2fb0830f 100644 --- a/bin/tests/system/verify/tests.sh +++ b/bin/tests/system/verify/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 failed () { cat verify.out.$n | sed 's/^/D:/'; echo_i "failed"; diff --git a/bin/tests/system/verify/zones/genzones.sh b/bin/tests/system/verify/zones/genzones.sh index 250fdd18708..fd599d802ae 100644 --- a/bin/tests/system/verify/zones/genzones.sh +++ b/bin/tests/system/verify/zones/genzones.sh @@ -7,7 +7,7 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. -. $SYSTEMTESTTOP/conf.sh +. ../../conf.sh SYSTESTDIR=verify diff --git a/bin/tests/system/views/setup.sh b/bin/tests/system/views/setup.sh index a2f54fb5e27..4651da1eb7d 100644 --- a/bin/tests/system/views/setup.sh +++ b/bin/tests/system/views/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 ns2/example1.db ns2/example.db diff --git a/bin/tests/system/views/tests.sh b/bin/tests/system/views/tests.sh index b533da7722a..84bc223b7e4 100644 --- a/bin/tests/system/views/tests.sh +++ b/bin/tests/system/views/tests.sh @@ -9,11 +9,11 @@ # 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 +noauth -p ${PORT}" SHORTOPTS="+tcp +short -p ${PORT}" -RNDCCMD="$RNDC -c $SYSTEMTESTTOP/common/rndc.conf -p ${CONTROLPORT} -s" +RNDCCMD="$RNDC -c ../common/rndc.conf -p ${CONTROLPORT} -s" status=0 diff --git a/bin/tests/system/wildcard/ns1/sign.sh b/bin/tests/system/wildcard/ns1/sign.sh index cdd7fe94aae..514aee15239 100755 --- a/bin/tests/system/wildcard/ns1/sign.sh +++ b/bin/tests/system/wildcard/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=wildcard diff --git a/bin/tests/system/wildcard/setup.sh b/bin/tests/system/wildcard/setup.sh index 9c2a601ef8b..464270e2b01 100644 --- a/bin/tests/system/wildcard/setup.sh +++ b/bin/tests/system/wildcard/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 diff --git a/bin/tests/system/wildcard/tests.sh b/bin/tests/system/wildcard/tests.sh index f0fcdb4f91f..94db6ecfab2 100644 --- a/bin/tests/system/wildcard/tests.sh +++ b/bin/tests/system/wildcard/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 diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh index c4b6c3a48a8..0ee630a4fbe 100644 --- a/bin/tests/system/xfer/setup.sh +++ b/bin/tests/system/xfer/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 ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 6 7 >ns1/sec.db $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 6 7 >ns1/edns-expire.db diff --git a/bin/tests/system/xfer/tests.sh b/bin/tests/system/xfer/tests.sh index d648050fba9..1ff18e2f09f 100755 --- a/bin/tests/system/xfer/tests.sh +++ b/bin/tests/system/xfer/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 n=0 @@ -465,7 +465,7 @@ echo_i "test mapped zone with out of zone data ($n)" tmp=0 $DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.1.test$n grep "status: NOERROR," dig.out.1.test$n > /dev/null || tmp=1 -$PERL $SYSTEMTESTTOP/stop.pl xfer ns3 +$PERL ../stop.pl xfer ns3 start_server --noclean --restart --port ${PORT} xfer ns3 check_mapped () { $DIG -p ${PORT} txt mapped @10.53.0.3 > dig.out.2.test$n diff --git a/bin/tests/system/xferquota/setup.sh b/bin/tests/system/xferquota/setup.sh index 2cabeb7bc13..88f274dba2a 100644 --- a/bin/tests/system/xferquota/setup.sh +++ b/bin/tests/system/xferquota/setup.sh @@ -13,7 +13,7 @@ # Set up test data for zone transfer quota tests. # -. $SYSTEMTESTTOP/conf.sh +. ../conf.sh $PERL setup.pl diff --git a/bin/tests/system/xferquota/tests.sh b/bin/tests/system/xferquota/tests.sh index b5a4535077c..0e12da6993d 100755 --- a/bin/tests/system/xferquota/tests.sh +++ b/bin/tests/system/xferquota/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" # # Perform tests diff --git a/bin/tests/system/zero/setup.sh b/bin/tests/system/zero/setup.sh index 7ef0b8fb6b6..dfda9abee1e 100644 --- a/bin/tests/system/zero/setup.sh +++ b/bin/tests/system/zero/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 copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf diff --git a/bin/tests/system/zero/tests.sh b/bin/tests/system/zero/tests.sh index a5e4de9c4af..f15d436ce66 100644 --- a/bin/tests/system/zero/tests.sh +++ b/bin/tests/system/zero/tests.sh @@ -10,7 +10,7 @@ # information regarding copyright ownership. #shellcheck source=conf.sh -. "$SYSTEMTESTTOP/conf.sh" +. ../conf.sh dig_with_opts() { "$DIG" -p "${PORT}" "$@" diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh index 732e95d00fc..04ae5edeb42 100644 --- a/bin/tests/system/zonechecks/setup.sh +++ b/bin/tests/system/zonechecks/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 diff --git a/bin/tests/system/zonechecks/tests.sh b/bin/tests/system/zonechecks/tests.sh index 20261f273e5..278c54d6196 100644 --- a/bin/tests/system/zonechecks/tests.sh +++ b/bin/tests/system/zonechecks/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