diff --git a/bin/tests/system/README b/bin/tests/system/README index 068c1107bdddad4062b35c29d0aa07e9988f91a7..3ec1da1ee30d4a9526780c079c578b4956a4a027 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 aff35aa2be314f128b0613b078d68eae137ca764..8b7a84f4d5b592b7543a30aa2bb74e59d8df8a48 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 bfcd7f3fe8f47144efa82c137d72b1aaa56bd857..e13bfc444223e59b3408728bb519b297f08d0691 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 557a16243c40727c88b9fbe065462af26a36ae80..316eeecf6efeefc5cd362f30bfc99c2da8d0db69 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 1221e0c6c3d62a1998c185d9b2533962510d249b..4039f2a01f7270e4798f489f2fb7a917bcf39218 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 e8310f60f03747e19464bfcedc2cea95eecee922..0f56e7f4c8c93a9c62147755711f1824012b563e 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 cec70e823dcd6bfe404564f6ed635c347a7fd0a2..0c98912b06bab63a6fbe0c43b55f175478156cd4 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 7c6dfe1fa53a586ace760bbd39bc98476690a565..d8e62656d1a453826c564a8924849816b6e9de63 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 0ba574a04eae6d87368d1b54372aa8b2ec725678..670a65b426add1d78b65a3f39b680f1bad6ce15f 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 9fa04998dadf7b30a09f6abfa070dccd639ad129..2989fc17b0ff61bf0e62f14500031f2e97e7b515 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 0cd1b721be4d451395285e5935c12f5f9f1431fc..7fcfb00fddbb80b92179f4878a6b67c2415723f3 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 79637acd967174ab520b0a91b4b4f068d53984f5..8967b3f28d929178e43cd6c7b98f92d84dcea90e 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 e4b91838c1b61fb5d8a03664e8ec78e77b0a3fa0..e42a6744a137ef4b3023e88afc9f7116dd0e0d7a 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 fd26f28b4ecfba20850641d296056be7d44072a1..30b726528918865f52a5d3a8aecb5afb626c2d69 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 e6099c14729721709de732fb406077d91830f951..477b43f2b27d2281dbdb20db3a33c406a7d58bc8 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 6cd45cb73ffad1eb303c2f62a98fadd5b3c9ad58..3b6b2f7d3236cf8807c890c1f1b0ae511e615689 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 e683db06d94bcad205e8796bba42c822b8f613cb..aadae5085b17a98c0686ed4bd4903df9ac3c77dd 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 e4dfc600238b14c30ed83ad616733789865d090f..5a4c3ce9623d728a2507c2a325a8da87de5bd6b8 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 9fa04998dadf7b30a09f6abfa070dccd639ad129..2989fc17b0ff61bf0e62f14500031f2e97e7b515 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 da3a4dba6a90a17d510e486acf22b8bebb9546c1..a204cbcdb8c7b88cfb9a1becf01bac195e675949 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 1d467ac6387aa5146968c4f26cc016d9ed5bcb37..7c1b64ce39a2472f4638d479129d812ff063f3b3 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 3669183f7cbff67f9801519f1be335222e8a273c..f5ea0b9a635e3bc515df0b67e17fa792731a0081 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 285cacf7f7f4d0c2ec3db8f691648f36e611a1b1..4879f3fa3af81577637217d4ac194b183d9940ab 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 c79540c4cb366c9f2aec5b5abb6ab4f2a0b7db33..2b650f38d4daccb76778cdb8b0ae6c9cc8232fcd 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 75f4a8eb1f5c0da65f33a088a83701f1cba010ab..eac54ccdea76c784bf036e79210544a487f17340 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 717af19353a9bc40320e1315ed9577770f24fc6e..d0542cc31d7dc905686e1e80ba3c5c9ba8ef4246 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 a1ea0e33ad5cc2b41e327fb1920d59e3ac721a79..6586e59fc64baca49e78fc835c3eaed0f319711f 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 a557b44afef924b18dfc64ee3f483c108161cd66..b08b15f328ac6328c783cef0e2ed7937b462f38a 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 d8b17cfd0a8fd8a4372fa01dbe704dda966a8c8e..2397d897ff9a943f6118ddd78f5ef84f7a20f4b7 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 dc8f4b28a91bc9eed5dfb07ce7c7afb69aa04ea3..2b6d03614a5bb11779fe925b058b2d1016b2edd8 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 15f597c82910fa3a531739c910b35188639bd854..5c6613f02f6d8b35065e30b38b9e83a5c7844170 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 70558b1ddd1103f48f50a3feb76590446e5d8b56..4897c34f078225e40b92e80595a7f33ed56c2ac1 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 96f32bb596ae230dd090c1adff5321141691d495..8fd9e26d6dbadf560d858ab78214b4c1ea16a6fe 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 3735689f7185373a62a8ef84872d62a915fdf6bc..6daccffc2a095e04a996499e1e39a7456daf2abf 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 d4b3c665cc618c4238190def61fc6f0a304444e4..54cdfe6996d32ea49d88ec8ac70d08c4ea9b401b 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 7c44ce265bcae77a5bf1a30de6ce3580217e8d27..d20c51a371c8a66f01bdb597a6999a5a4a699a92 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 ecc72c02769e45e0fe46448eb03e788381744d7e..d25b6eca179b9f723b4418600ed8f53aedf8ddf5 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 3871fd37f96cc0d3f28d825d624f5bcc120366e2..a17d1ed4d6e937e9fb130f14d4b2921ad17404c6 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 303e87e5eafe2741818ca93bc61eb1673bd2650e..ca378fdeb8a228610830f46b53f1970e58b6b7d3 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 e70de1ac0c541d4446be3ae37e7222431e41c80b..8c850438f97368478200c97115b8cb55e00486fd 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 20a115a4d000c6ff43c700e151b014e206ab671c..903fe153673732e96a8148f65dbb6f7e46990b29 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 9a94212e1162d284694f0be5d32eac9f4d477434..b1b2ac7ebd48a5880ce2e3537d0cccf27c0c678e 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 a0f622fe847a32ce6809e94faac1c615ab71aaf1..74b7b4a7d0759458d2e79fc2adc0843b5ce75f0f 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 efc2b30a588884df580038718f5ed79fec63373a..a85cd99dd4b1e1392515c780c22a6f955177f0b2 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 4f37d0228c9de530516fb5541b546f1704026f92..e1a64b8c11984459ac94eace90e64c0c4cb80606 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 6930a1c8ccf82e8f8ead192500b4f7d24ac782d3..550f6964f6c23ed05ab2ff94fc326443b4804560 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 c45c2b2c4c3a4992785fb90cc942e02113b38481..7813e45631c22533de90d06ca68fbd72a7cf4b8d 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 bf1af390f24b25bf965bc3a0c5934731e9d3a85a..f12c3ab3f3d7a2fe42b64117637caf3ccf57fdb2 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 e0be7c0a7540ec092bfbddc3076ae93144e5edfd..1684a0718768ad90ed66681372ade96a16b51bff 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 d7551eade99f176d4fbefaf6dd8af2c55d629c7f..bd457c68b536aa1915acd530e82e4f24f810c7cc 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 d843fa117b24207d36b1267374ef4c0063de798c..3374dfd06a6c5bd3389eb880f7b7274c2fd41268 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 c0c32e0418b75257287f3faf5b58256c9b4807c0..c087dc14d10beb3964e15f7eca9d5e9a7d59cb1d 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 f2c1131a1de527a227bce9e51bbabaee09f97a02..782cb0654179308014a5b3064f550cc3c7b13892 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 fbe9ad71dcfdf86579e79d07fa1c69cc4455dfe0..57df25b4886b9c26da5c877215fbe0e5169f3a16 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 588278950074d01d9de732fbb4b91a6a4143674d..bdc67ec4b3ddbff68f5c9079159b77abe68204a1 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 c99f7a537ce092a61552cf7bdaf2d20d91469668..9cbf15fefb0aa648680ac1111819529f8dfd0e2d 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 cff898af74870641bcb99288a53c23a3b6f0eb43..123a9700076f744fc3c45e599ec12c5d5b4b5d8a 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 54ae148e0cae83d944076f69649cd75a0238cd02..f20bbe56f5cfd5b076a3db05ebc5b6ae36e55946 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 80d8881c1507aa80ef246e85c9eead1b795d1d62..29a4dd634d0eaeb7001ad9c658d97ec274e04613 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 625300339cfc2c8ebb83001f14dce7bbb8e436c7..ef12066ad5b3c404b3e5fa1145e354b1fa3473d8 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 9798e34be797e109e78a6e206a6864d5ed5fd75a..a01b4fbf6faf0c690e307473ec236338f2cd0c0b 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 566a4f09518ad7a23067685467c85268f4d2adfb..f17927d675bd4f0c3f6fa2697dcfde9632e98df0 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 53c207eedb8cea3cd87ea11d2c3df909adf31e16..5dd570ec02b23ffba07a1e79758826687e2854a7 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 0ed31056ae8b5eb0c751670e754eda63ea7f6f7d..7aaced024b4965e29395989e65ce6de15cfc0991 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 60ed4a345db2329eb16bd686e52a79fd1f6a37bb..810fd285d4ef8ef638aeb404842c78a85a615328 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 2d2d6d240d4dbbb0eb26b3ea6763ca4488a45327..ceb2e24fb95c5a1e957d4dbcadf782e7d30381d3 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 ccf14bcd8e3e5a3595386cbe4751b03dda916d02..0537546f96e6aa5a1766e86f1b156dceede281be 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 4d2ea08dff76b8402a25e25c704885c89ebb7bf3..bb528186da768679a63a35a23b07eba8ed2bbaf1 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 e7308b015ac833473b4a35b5b4245eb9844bf41f..30d7f277ea88d094277b4b1af94289a52bcca11e 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 b254fd970ca3923f32f0233b15e0d8f9fda0d2af..4c24cd5898924c51b6ebcbea6e6c86b5dfc92e92 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 984d68ba973f97b574401384766cd4e1fea50973..c347c47a2281411429a9520565dd6cc9d2107ebb 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 e35a82962e86fd1572671a2baec5acb1f30e270f..efe74569bc03c3bceaa59c4dc9f4c84e4fe9fcfb 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 5ea9279ea793324518ce90f4690c86bd2564f66d..74c231359005688289695c27ae071c8fb44de9b9 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 0f5767dcebb6a52429389bd976c422d9a953a516..7b8f53bfd5ef14a67be2c0a47c04d354001fc069 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 313204c00c8c7c05215d64ccf682d952ba514c04..4ed198f7b4aa245e6a4d512b135c28a56d080585 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 9fc7ddb93f8a8edbef324b1ab46a22da31c28b26..411f99a70b2d203457980c6ac462b7aeb34cb29c 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 69c4995f41b846769911bda54d68ab1c00a64e63..6b747792eb208fd1a4401cc5deb8e72a8dc268b3 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 8fc2b21b1925595f8b9ab5984f21b6380832ac3a..aedbf2fc50936e8d3a24112fa8f7c3a9928ba2a2 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 f1a462a263a65fe7fdcaeab4b57895d024b675de..698d51d660c20679e7c57f748f87aa7ddb34cb6f 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 ddd7a92746338cc7b8a0be729e518591d4732be5..5c1f217013a7cddbf57fc43708adf7cd7844166c 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 e86ce7eb3973f854b3185ae83df541525506adb8..564d635d5082549211c287f3bf682c270c953c2c 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 69c4995f41b846769911bda54d68ab1c00a64e63..6b747792eb208fd1a4401cc5deb8e72a8dc268b3 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 2dcc138c2fd1bd54a8bf8485cff20096c82044c1..7505eba60ef4586d3fd8d7cf4c2953f08da4d33d 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 0f5767dcebb6a52429389bd976c422d9a953a516..7b8f53bfd5ef14a67be2c0a47c04d354001fc069 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 515db8aaf5d8f7d5af46590dd51afa4a685a5f2e..433afddad64dfe8b7acdb7ac7a6a7107984891b7 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 69eebf319aef13cd8aff5218e18bb8bbd9821a19..ff21b4129761eb9953c0f9543b1ecec25c1e09b8 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 93ee6334aee7007f54fa7cf2f037fcdca9c7891d..b96cefac948acc7eff13c1918232f25523fc4dd1 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 c4e16dd4bde2f4f045c027ee4c178ef1d2b89f5c..cbc00cd64d3253f12fa396cdca559d171f3b7e9b 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 027a439976c000a187f65ca57fa9c52cf096269c..8e9ee7b3d2bc722d7fc0ecc72d5ad89e4fd3eaae 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 adc29af4a333f4a60ca11731002a521a7b8ff20d..e8f3d37ddea2e2f249c4a531b04734c8419ed09a 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 05780cf4c6077864431c7f189c30f2c769035434..d7d5a43997a8ba4f72d0022b4be41372a66c97ff 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 21a33fb482d4476462b71193e23eaf474ec1dab5..a5ddcb20caca75412ed61154ff090b48353ad17f 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 0d7a1271df0eee5268e5a5c700129bcd586a2a6f..e5ac5460d8ded998c1a6b77d327347beb395f626 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 0f5767dcebb6a52429389bd976c422d9a953a516..7b8f53bfd5ef14a67be2c0a47c04d354001fc069 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 51e29ea6962b4e86bebde7a5097b885bddec2876..ca629c5f3c47f7520bdf76d049748b1010c54d45 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 5d4894ead4fc9bf34d119ad244f0301bde8b43bd..45f8cc9775ce4031e9949630987b4a2560eee7aa 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 9a201e959f3300b37daecc7fced4dd0b6b1bd368..74c4eba217cf43eafb3cdc513175d8e45ec5e326 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 8178c2a9f269ab107d883958911a3a59e9744bbd..a00c41e5238b7f1c78777fc7d6ca2c9d7b427312 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 ef08a2152ea2ecc3c9d1e7412362b664869c2c20..ed37f5275751ccd2ae66b708000136f81a99ae6a 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 8147edb8119eb331f7d790da5913396bc49e0a53..fcd9df1408ff55f1340f2f12b1f8501ea969ceb6 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 0f5767dcebb6a52429389bd976c422d9a953a516..7b8f53bfd5ef14a67be2c0a47c04d354001fc069 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 2bb2f7166ecbba0c24ce5fcc46513a6982f9b5bd..95c26f941a649958562880784da696b7ff50d9db 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 bf1af390f24b25bf965bc3a0c5934731e9d3a85a..f12c3ab3f3d7a2fe42b64117637caf3ccf57fdb2 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 45350ae5b8c25ad8c5c2fd156a327b5d2bb420d5..6b7220bbc61005f34cd9291956408f0cc3bfc2b5 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 44b0179e14b2e7000e0c76d6caad789f7ed0eaef..6cebc568139a149dfb0906d4ee8bb8c8ec1d8c1c 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 f2ce745b6723b623d21c4b751270bb69d37f647a..a3bc11030fae32ed516afeaade567f2d5ad4d68e 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 587266d64af80fa51c6c077bb018ed421dc11024..4f495c0abe0451be0b1aa9af5316cbf2f6ce9e17 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 cd4fc846a89e0df09bbb90038c47d1d8f518e55f..b00957cca43f1bd65e72fd5a83f507b5d3f61af8 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 462cd29e2ed569e8ddc042309eeb019a0b2f56b0..0330a4568327a0f449ad2dd23077284a72ec4259 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 4e8a8df03837cf48ab380502900a311fdc12dc1a..49f90e336761aa83bb4e8a1bdd686f0f7bab958c 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 dd1a5f33c56a46936e61da30a3a82a203e02d9bd..f06052ab2365369c72e8fae476c56711afc4ad3f 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 9cfcb2ba0b578704c795a742d36da63b07f78970..c1d3d646601c73d4b0fe58d88ad6676303d036d5 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 0f5767dcebb6a52429389bd976c422d9a953a516..7b8f53bfd5ef14a67be2c0a47c04d354001fc069 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 f125ddc4a275e05e539c2108e20176fe2a156952..fd7ceae7af03d9122917eaf9f043efc7fcd711fd 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 8f216ee59187b667d3e9a0e6065086c0a9320c32..cd081e961f46ea31d53fb661ede8cfa4b4df166f 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 60d77a97af73cf715aea0c757eb8f82c994c46a7..ff585140b334945fe5996045424932134bb2698b 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 588735d0a6abfa0df859ee9fbe22da4daede35a6..4436fc736f278f15d3435ee120c14f1915210bc8 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 548ee0c3dd6bc9b5bdf203e32bc975be8b2c4671..b3c41d9c88dbdce5209d43388944252c57017cfb 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 4b02fd3fa0a38839e110136dacecf5eb4c9c5924..18de440ddcd3c0194550402fbdf15a72c058b833 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 b6f274e6a77de960e1cac3e682fe6d6730b5d3d9..2fa500cfd4644a33ad5aaec217de71a36e79837f 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 a63db413ef758fb59ed2a62e99f748218482c8d5..08540f2387586a311e59ace5739be046cdc9a4dc 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 a41b0ca946c07b9a51c6fbc2a8d3d1ec385529d6..7552331990ea2dfb25cc36f935cb081ba2a7a3e6 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 5f92cf7f5edd44781fa324f88043e85eb1f91822..a2dbda682d2f650fa4d56bdf69691793f37d8afc 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 e683db06d94bcad205e8796bba42c822b8f613cb..aadae5085b17a98c0686ed4bd4903df9ac3c77dd 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 0c067afc7a1ede4281f4c72b7224a2905ff3ab1b..e29f785eab8a1a3204210c0a1bf838a1ff912a04 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 21094ce9d4cc9146e24fbe6db83b0a6729e0a312..eabc3b8d5ee91e7ce87733bc4a5f4a0b99ec6388 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 9a796db57daa2704b461e5b9734ac7d210bd3c35..fa9a7f96a5c1e77383401b7f0cfa3b62435a6254 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 9a4ba792cc6f09555b79cec0717662535b565233..e20b97313e94dc5c4545f3432f5ab679a77633b1 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 8dcb3689fea581b8ff4a24e347b82c6430a17cfd..aa13b05761b49eb66f887159cb441a030ca9010d 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 5af0265138aa71ba59e030e06fcee90e9b01d04d..12b658e3ef2cbe23c0e71ad116639f05c9c539a0 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 0f5767dcebb6a52429389bd976c422d9a953a516..7b8f53bfd5ef14a67be2c0a47c04d354001fc069 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 8b7729977887768d93a00d3c0c8ebb8b74b0e523..d9bd462726e2645c2a6b916c613c15d39c1fec77 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 c6198b704659a0b5f80babbb0176c6dc548c2bd7..a19f43430fe83c6e77c33d44d3985cb0fe483cae 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 b04bd1994bcad50b45de4617a6ff6988e7f4d318..d43f5ad72af7dd0097584c8fbb61012498563fd8 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 4f1b3ae5ea548ee6c51c11402bb1d26bbf454713..86cb9b3349133eb0ae2b49116cb594c8fc6f1f53 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 2c3ebc3debab0fbdcb19795c8201ca9a79267a78..3e57f5f80d20977556acd14362efe19b0a81d5af 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 1340343e6af522d130f05ad3c585dfe4bf57f127..d29879a5791b0b3f4122aa674cfc866ab05b7626 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 c1530f892beb3a74d01af822172c3b328b8636c7..a104cfd033844d6fc6549dcf320006c626622aab 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 05ff3e659b09588484d6498d8b19ddf2a8c6d0ad..a7cf0190f118c4b92ef5a1f415dfcb44878c1b02 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 7d3c46e01ea5e77a616bc2ff2cb1a4c7e8349387..2433e797ec2089b67b0b3631cba98457a737a6ce 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 9d4c843eaba9c2bc4daa48bf0b692e55e8c52e7e..0c4394ae051be39bc24a793c461d28bfdb37ec53 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 7487049a270fbb0d9c30820b91d3e4ed457eaa05..08f6c1efbf8835aa0682549e4c7b5b82bf342a59 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 29be15b93e9dac42e650c644042595165370b54c..7d6cbf6c68d010462b286c627bf11e9c9b8140bb 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 4141130fd311de7e3146a2c83f08646ab4aaf51c..c80faeb7108b80f7c5df330c81c4d9682defbbe4 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 a62767b07977d61d0a759932194265138b772823..80038efccf29d3c522d81d8c398a9d0a25a664c9 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 f640a6e86c0e2c0c17f648d4a115be4e294ea4d4..7200f5c0fccb65f4f05e5b5b6db6324755c6b0a3 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 c2ef857d58c0e2c01af0795be9b9705d0764cc88..18eeb24da61252c045c27b7d6bb85dc3e4a04ebb 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 8341bcdb453b06b92e434e9096e40091f69ed2a3..3e3da8c36f2f1dd3f637c25d8a7e5ae467172703 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 4b0a1e0f8da294f9542ac0108dc59e432fad0302..46dfe7203b48aa373fa339e2319272161fabdae9 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 86e4e4354900934f29c0251d267a39c2ebe19f94..ae101a1109a523af5a47d0b3c23316af288eecad 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 62046b346e964a59028b89c683206444b6cf5613..6dbd6b999adc45f28c4a7e97e2e3fc885b6d4479 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 c371293d7063f45e181e632d8bcff1c72002b375..dc4d3f5a63d0cbb0619f12acd29448287fe58dab 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 151f4f5875b19f8506a3709e5ea5e40a93805809..635831209922dbf6e2d3d8b957b0c755695e9bbe 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 e7a21a6da13a62b879e121e5f6d31c2e9f8ab86d..1b0cf15cc75b2c8ee0fdb296ed207f6f60ec894c 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 a055bc4b0706df3ba4c970aa9552224d6d9a5f99..c1faac5dc5ecda85c47b4a64e201f2dab96847bc 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 02dd6deda00d12a1f8de1568cc514a935aed2203..eb7dad655589e1ffd50d234c6ac66fb3f9234a50 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 2c73a45a9b4708e174d360c61ddee6639f5027bb..b19d9083c54f0ce5b8727ba984ff0c8f7091c2f3 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 8afa71cd9036871295b78a2973e186db90d74695..ceb5782b6b89da59a18e0e4f1b928a7ecdb8884e 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 0f5767dcebb6a52429389bd976c422d9a953a516..7b8f53bfd5ef14a67be2c0a47c04d354001fc069 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 c9c17acb71c6e6cd6fa52740cbebd80ae9a723cf..d4cf213cfdf78bd584f495e3707016a9bf145d7f 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 a968818c78f45827cf454eb7f78ae864c0802a7a..234c452925732ff369fb531e954e6931079d13b9 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 4815bf954ae6bc843656fa6d3bf852dfc9f8be4c..9a3aa11e85693bd7ca817684940ff47879c3595c 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 d63fa0371c62094bcb74cc1dc060c685556e9dba..707c79526fd9df87941429270d6bf21da4e3a8d0 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 0d8baf3a3a68a7b6d675acb336359aa7b8164bca..38acf40169293bba450db8b0b6791dc1693c3e9a 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 183fcc36ec421d65661c83212a4ebfd0655b21a8..11371c7d2d083cd053a344a4ee3ad27d46c40b8b 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 529ea1bf34c0fa931c665295a0f020a5f7ac6900..dc06dd4c585e392bb8b5371061ca3c971af25017 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 64eb4ef2ad96d66ebf4284745c99160d73dd8f22..f1f1d4af377ae25790b8caa8cf81fbac76a5e0f5 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 3f3468004ab4ed661761f5b4a5a74f385826c9ce..be2b469a228eca7a4e77587e75649919451dea89 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 bc85fc75d0680fb7ecfd2b6ea80215d79f636ac3..5de6f4a17ed4299d7a744c20377897aeae53d13c 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 98b33c08f1a827a3224e712e67b7dfd26ce81a6f..70962ceae022de6acdfd686c325ee6198dc81f57 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 0ad125d62b0225ecf06b1f1573e3f4202b687995..8484b8ede56eb8468a4629cee4b9bbd336dcca3a 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 afb73603d9715e686598db1c7281386a08b17a1f..59c06e9bbf99bf9b6832aab83af5991cdbc500e4 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 c80a5c79a3bc7386a43bb0e06da33ca3fe178c56..166f30617a44ad15318cb2221d3cf5698cd85284 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 9ee737ec5be0fd55585d1b2e57c74b99ea44f328..890ea6cf6879578b0a5ef89fdd67fb6822cf1e29 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 cf295c42e8b1f8ab7f21fa809fc1bc551375c8b5..820639529e6e9497d60c63cb434268c80c33c67b 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 cf295c42e8b1f8ab7f21fa809fc1bc551375c8b5..820639529e6e9497d60c63cb434268c80c33c67b 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 2236dfc93164cbc3ef4bfb22467b9c8a15bc3925..ca5340e46957dd7a869b4bbc8e6c98c3c944a210 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 3b35510a2fb3f1893a911dd47e72d3f2b2a64376..43750679720fd7e7849f353a3cfd97f45cc14248 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 e720db3b1ea9990e2314ca2f5e687dc95249a27e..5d0859046466cc1016175dc04202aef80cb05f0b 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 5b6ad516d7abdcad7fecc46edb370d027b9c765d..ad225ec17d4757e17c4e909daeddb502a3c48515 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 cf1f0f45911bd074bd9966aea25e03312751365c..dfa3e38575d679c1914bcf80331e33acfc23d075 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 e9469ca27b260e7934cfcfc844599ee5d8bfac1d..999c2c373cb7deebe6b2340272eab46db9198eb9 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 c15ac085fb0919b879f98f3de26755deb7595cd7..7a8160e1ff9021aed0465d136314f1d64bbbeff5 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 d3fc9bef30d4e1f27f7ef742175783217bd86f2d..7142e645d483329d9ba1c2525975304ba16c0a2c 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 340e02407f70d8764e6387c68ff8ed02feddd992..cf1ca16bf38ec5af8995248b616a1ea6e6e73210 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 e847ac33feb931db87fa752b9f09461484e0faeb..fa03c900a3adbec7750a211d19598c2da3e236b4 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 43b159c8c7e934b3f0ee14e8e8ad910c45c28c0c..b758a31d044d0f7d4c80251cda433557a6c671e3 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 8aa5ba8d9134474942e9a628974bf162214abe2f..9b416df84104cc6a3b3555d21410e26676f30db8 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 adb8f7da9bd0682d8acdb8f473b851cfe0fff0b5..fd0287a17231b8b32b25d503560b2e348202494f 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 2ad1d44513d9909ef5143ae8b778cc0dcb796029..64146a4a6ea368f52441958f7fc9c6f73d510f9c 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 4edd5f513710e6b898f6d5214f483f2e40a3a9e3..9ede495d70d6b4c46e6cf3c2012431e4faf65997 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 1c0d9b9d4918b21cd4d647d7593fa56ac09aafd5..762e2208b86ac7cea8d9e5bed26605793973d000 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 267f5dc21b9a7a594839f8127c9ce85ffe90c16e..44c46f051f4738d38fde9993e1093f5d72dab7f2 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 43b2b4a50acc28c29ad6aaa955ea505a5d17db07..a8436c41f749fbb4901d9206c20a7315e7d4b719 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 e5b4fe84cc6e4f0de0a6671951243d9cb0613ff3..13f46ae2309f57d88cfe7450b3df5e673fdee383 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 64eb4ef2ad96d66ebf4284745c99160d73dd8f22..f1f1d4af377ae25790b8caa8cf81fbac76a5e0f5 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 dd526d7b2c5110de7a047ddd98f5ada2f4161a20..b415a17ffdeedac5539664c26b0b078df607004d 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 f3c0bd35198ac4b9c3a8def592eb3bbe09452dd2..6ecdf0282e662b4ed0aec877487d508c36e4c09d 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 a3450f1a38572d1e643265be6e1609782f529dc8..f221ddb205a1b2e5b9894de3747682305bdca267 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 a50cb407673da8028e8254ec3e1f508eb1fe88ec..614a8ec47533c01ec9eee2ccf83a33d2d0f852b0 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 82e51c61f75e86c2b85a7aa3c177b1c0824c3548..7e6ca13f77156194277b7295959ebcee50fd920d 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 1c6233eac04721a0a2433e63011d763921c20e83..88e881a17744fff71f1fbb1ff941915a26f44529 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 80b618b923546195c13892d735ce12d4eb910f32..f5d00891cb51be97ea7dfe14a21a79a46cf8c3c4 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 cff35deaaa5a2b655e5db7d6575ce3c0f2552310..3c59e029f1d8b8d85d42d5254aaaad2845c15e65 100644 --- a/bin/tests/system/run.sh.in +++ b/bin/tests/system/run.sh.in @@ -20,12 +20,6 @@ srcdir=@abs_srcdir@ # shellcheck source=conf.sh . ${builddir}/conf.sh -SYSTEMTESTTOP="$(cd -P -- "${builddir}" && pwd -P)" -if [ "$CYGWIN" ]; then - SYSTEMTESTTOP="$(cygpath -m "${SYSTEMTESTTOP}")" -fi - -export SYSTEMTESTTOP export builddir export srcdir @@ -92,6 +86,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 5f20e1666983192aa1d66b7c701a06d7b3031ddd..2f0c3a3dbc147512737ceb6ecde35354b4efc745 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 f3f168e4792caa844be01385247d8222677d1da8..4f01a63c0b235bf4acf5b84bb201f183cb73b082 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 c759fc6c5a82a6d9f501f9cf44e3d15e33e7a94e..8721f12273c00ba919b58c247da487ef3fc2ca25 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 f46924acdd5f547a4ccacacac7feb3a111561dea..9e63d77a91a9f893a94c388b9bc7d8a38c904c96 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 f0ac9e60f73fb170b8a04da198c302b2c34bc02f..963278e976140df51d8c583f11c0c3ce6f22a6d7 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 c85fcfe28a3f52229b0e6a484f261477360f92a9..7c9de93bdda6319541eb71086d0c841bb92b2681 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 ff8c1bd2aa4072db4a6e1502021a30e9c62ce378..0dd67c9af5710a010435b387665cd7b847c5a6e5 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 7e5b2b3beda35a3a2542535a7296e754e9cdc57a..2ae6153e988ea2f3228eae1cb165dda7b23eb1d2 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 11f866abb273f556f5570aa39baee46da9d86ffd..5d1a4ecbd5302e1ceaddfb2b87d0586af6b8e201 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 82b4301804528a8e8798cea0b8c53f566ae42003..026e0119aed67cd20df2ee93a11a65bfeb611d9a 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 ec795d2d6095e67dc467def9a481218519ff200f..53311f5470d2741a9f49ec19dfdebc6f5eec089c 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 51e2da143066ea05dd1fc3361fe6f4a3c6800c24..09ecfb8dc552c496674e68c405c7fabaae83f87e 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 a5a30d57df24c07adb106854ad499adde178c4b1..7bf6072070c324b16047ca67fa5c93d7bb4cc00f 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 69eefd11ce6ed4e752ad0d2afa6696d68f7b9315..623aa29fd4090629a19560651f5af2a93f5d82a0 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 c08c1f1b7479153ee990ee01e0cf80d5d12425d1..e09e8856cbc7bb8db3ade46f590c6bd9c1df6fa1 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 0f5767dcebb6a52429389bd976c422d9a953a516..7b8f53bfd5ef14a67be2c0a47c04d354001fc069 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 a20dc3f66caa4c54e7499d19a0c7bb4f51e004b5..6cda1a3f3d1af7a68b93ab19f25f6fd209c37f1f 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 0f5767dcebb6a52429389bd976c422d9a953a516..7b8f53bfd5ef14a67be2c0a47c04d354001fc069 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 27af97a3568efa790240e0010c907bd2cfd42c60..bafbb431cba10146ce81ed8d904db6536f2760a6 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 cd7e13f2f47f9ddd4af53628d99b6d0a77c8095d..b76e43fa9787c31b845e788d7d1d28f932af59b6 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 2f5dbf05ab552229078cd024707d8916b1911f8f..fd01039b8e743a709137fe3ca1c91bb923d7a325 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 b2af6098912daccce2db57c9b44f0ed0868c4cb2..a127b2fd350fff54dfd40d110ae08c3ed442af84 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 e487ff298c54eab9cc8bcdae461473a983b2a227..0a8e26a2bc6faa1e763a4ec7777186bd68aba848 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 e683db06d94bcad205e8796bba42c822b8f613cb..aadae5085b17a98c0686ed4bd4903df9ac3c77dd 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 5347ade54e5a78fbc2ce7b922cbe908158d0bff0..eaa7b676bd64821c8c88a3fdbd71ad48f8e8d5b0 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 f772c0f2b15d289773bcfe77ad5ab776e60ef468..8f7aa57c6970f89bba1299d03df7deeea8cdff23 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 2ce6fde81d3d4406c9cbf111f692dae428ebb9c1..b899186ce7438a38aa6649e7ddbbba2ba47247a8 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 8bac41fa8633f1c29df68f55191e2c2917919e6b..0a0376d73a997741145cd0407e861aeb2e8982bb 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 d9b57e0f92e3c7d4e98a9bf67285ab63188a147d..65de1419a2a784ec37185e97a257add971b9e1bf 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 dab4b9a46fa7fae8355ab5120e4eab203c066e0f..c34469e741b3d7d78980220e15faaaa7a03dad85 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 08edd332aa55a90b536f6fbfe82143071a4b4579..40cb0630fae1c2dcad9e06944adad19f57007130 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 e683db06d94bcad205e8796bba42c822b8f613cb..aadae5085b17a98c0686ed4bd4903df9ac3c77dd 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 20f2b3a24d29854a18243f25c72266d26ad5f774..71464dbe0bd7bc2a287dd158974cb0a8accfa7c7 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 b45c577fd45264721846830454f483b2ed5791e1..5706906b031ddc7131e41e6f74e70c22b1325e0b 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 fe77278c4756e5aaf44bab6f20e408b883fe15b2..ddc1c0e677bba712bf1a4965859cd1de7faee77c 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 d5ea27298a74e95f97801d9100ac1392dc6c0952..a75921cab5581dc8bdf13592844170ff7ea80b6a 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 dc9bb97edb4fb341f9c187b1bf5af4cb5ae0a474..f3aae197ef7c20376478c8c56474f014229a895c 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 a659019678e7680e0c5571509eda9f463209e69d..0f4deb8e37b0ebda93d97cfeebd91ef2f8b4927d 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 c4d34ad7c3c88c63f8119121642001f6a84b9bec..8cb8b79ea2871f0445a8d808c1f2fddbd6df3672 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 64a99fd4c754d05fc8302a6978e968b0f142f6b0..dbd8684c694698969fa9da54f02eabf674a0bcc7 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 a8f43ca3007f8b143a5102087a90b920a655c2a9..ed81258072c248af5a21a14956a4fa05e963d5b8 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 014c1eb18f6e45fd3516e015c8fe06e5b151a2f6..4c63bc7784b835384caea9b68b5a1fc233bbe7b5 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 f7d816e372570dd4e4ac7025fd7884c9bcf54b19..a48d078e5a19226661ec69150571b7ce6f4d719c 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 507923274132fe27cfcae182ac03e4b2240e7afb..357727e14398ebfe0333e5b16759465987e60c46 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 f49f6eeda05877c271cb91beb9168085581c3f33..142117f23a1b6627a4344cc3fca3ce8f7cb2348b 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 1629d0cb71534c2248c8b3c55b89340e73f39121..1d4bf137615f64c28d37046779ff8a7117e829ab 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 31f031ea7b3b6b3669284b9419b78adae4252440..9f23667a6ee838a4133a65877d38def788fc32a5 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 b552ebdc8bba7a149af4ec729a1f321d83192b17..c81e201f5c8975c45e2e17e58e6e486be02a1c91 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 f6623ccbf1f7b7261363be02fd231ef4fcbc1d73..308ee8622874f32ec2a65636dfb4dfbdfbb19b13 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 8a19050c406a8d1345d961c2da23361d507852d7..f039c1637889753f4106784c47f28ae83792d97f 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 7c905f6b5ed592bf4d60e86ff12d33bc0886420c..68fd0d2b81440c1f69e3f2a16c8eff946755a425 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 54ca973f1d17620c3db12acafb7e63be185783c4..e0a3582b7f59b460b2e6a15cb5aca856786bfe24 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 709e4aad14baffb8ec0f5deb215e0e2d9f44b7f8..7fcf7bb5e131b848ba7f12db3c3ac1fd8f44e74e 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 492731f9350c4c6f1b013c60e437fb396000a694..63dba9ac4161a989fa330e3ba80d4e58ce13f66d 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 b87b0ef33810acd5211c8070bb76d1c95ec6e8cb..b4f3be26f195c73f30247b74cbc9345caca5b661 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 64bb7feb7015d3740a4c481dbe98bcbd93a7ae8e..219cc3f816be692e0ffe30fb20439eafbcbce84f 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 a07cceeab1f59155d2b998de2a6fb37784abd1ca..99dfab628e10c2c4c18ff6576ea163baf22fe977 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 8feca6f49d641808a006d85b1535a0c7004d1c5c..655754188d66bd16ba127ec65169980158b14619 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 8c852d571437e2e50eec8ba9759c9a6abedfe811..e6a2fb0830fa1fe92423adc7cdad95d7559dee11 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 250fdd1870890d51ace91fb3112e34917efb82d2..fd599d802ae755c7990cca9b2eb4e4614053ba07 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 a2f54fb5e2780a620d3a7616e8faff4d5e65b083..4651da1eb7daca1cddfc12a1561ba697ad68ca9b 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 b533da7722ae131c055afc6bb03996072b2015cc..84bc223b7e4f59a42c5276315ca7f6f2112478ae 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 cdd7fe94aae1d49eedadf69dbad3dcc8734ede78..514aee15239d0f030d87524cf013f5cc4a2927b5 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 9c2a601ef8bf30de7364bb20059e645c3499b0fc..464270e2b018a7645837e90578bc913a96210cd7 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 f0fcdb4f91f787abc42df5a43383374212713893..94db6ecfab2d4c335469453dab882e9c2bc1c342 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 c4b6c3a48a804c848984a63a3a3e3a31a4a0e8b0..0ee630a4fbe835b9e36f8b3f153e78ce6d85566f 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 d648050fba9b7f1fcd00b8ab015e5b6942021ee1..1ff18e2f09f133c2f755d2388824c44d54dd28bc 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 2cabeb7bc138babe76a7a6ac1c1dc625b7b14b1f..88f274dba2acd4eee4bf0bef45076c9ed5d22690 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 b5a4535077c69be51f30fcd5bf0b0fad1573f913..0e12da6993d293fb776f29129dfb6c1c14792604 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 7ef0b8fb6b6ca349459fdc10c68e5a81afe2d443..dfda9abee1efac361dc447fff97332eb84ec4801 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 a5e4de9c4af0596aaaddcfd764fb597294fbc38b..f15d436ce66175380bb6b6ec8ddd6e6a17fed739 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 732e95d00fcb5097aada1675b73ea6a3c479c0ea..04ae5edeb42f9af46bd054bf4ef7a6da816e8fe8 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 20261f273e55417193a5fa31b3c7963f27c76180..278c54d61965b4ac12a48daab052204ad5085454 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