Call clean.sh from all relevant setup.sh scripts

For all system tests utilizing named instances, call clean.sh from each
test's setup.sh script in a consistent way to make sure running the same
system test multiple times using run.sh does not trigger false positives
caused by stale files created by previous runs.

Ideally we would just call clean.sh from run.sh, but that would break
some quirky system tests like "rpz" or "rpzrecurse" and being consistent
for the time being does not hurt.

(cherry picked from commit a077a3ae8a5013e089bb4e6f9ab8137c5b708dce)

diff --git a/bin/tests/system/allow-query/setup.sh b/bin/tests/system/allow-query/setup.sh
index 10b3c934a5eca5c179d182da3906bbb6a16dbab7..da2e3d79e27cbc651b553680860ddbb04e39380e 100644 (file)
--- a/bin/tests/system/allow-query/setup.sh
+++ b/bin/tests/system/allow-query/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 copy_setports ../common/controls.conf.in ns2/controls.conf
 copy_setports  ns1/named.conf.in ns1/named.conf
 copy_setports  ns2/named01.conf.in ns2/named.conf

diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh
index b6c9c50f99ed45e3648e4de7628bca10faf72dc1..d04450b6676f82657e57f26a3573cd23fd1c9814 100644 (file)
--- a/bin/tests/system/autosign/setup.sh
+++ b/bin/tests/system/autosign/setup.sh
@@ -12,7 +12,7 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-. ./clean.sh
+$SHELL clean.sh
 
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 

diff --git a/bin/tests/system/case/setup.sh b/bin/tests/system/case/setup.sh
index 066ceb2e0dc596e3c549d050934bc44a519e0c5c..53f01c4fc53af0f901ff4c97c6fc702cb3ea6892 100644 (file)
--- a/bin/tests/system/case/setup.sh
+++ b/bin/tests/system/case/setup.sh
@@ -10,7 +10,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-${SHELL} clean.sh
+$SHELL clean.sh
+
 cp -f ns1/dynamic.db.in ns1/dynamic.db
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in ns2/named.conf

diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh
index 59542094905177a68987b3165ae5465fe7e428f3..17b3dbb4e97b7339ee4dc4c56b353e2c73866ec9 100644 (file)
--- a/bin/tests/system/dlv/setup.sh
+++ b/bin/tests/system/dlv/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh
index 8279398d4212e63709359b19d610fb5debcbacdd..8deb456dab29118b8f7c882defccae0956451fec 100644 (file)
--- a/bin/tests/system/dlzexternal/setup.sh
+++ b/bin/tests/system/dlzexternal/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 $DDNSCONFGEN -q -r $RANDFILE -z example.nil > ns1/ddns.key

diff --git a/bin/tests/system/dsdigest/setup.sh b/bin/tests/system/dsdigest/setup.sh
index c7ade46d017a45be3f44021d3a1431cf6b605bd7..66d4af3bb91d3ca9d7468f5a8fefa8685215e948 100644 (file)
--- a/bin/tests/system/dsdigest/setup.sh
+++ b/bin/tests/system/dsdigest/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/dupsigs/setup.sh b/bin/tests/system/dupsigs/setup.sh
index 50d6bbddcab7a48dc231a3cfcb58469879b14012..0cc4048bee69eff5c1b37743662a3caf2548db22 100644 (file)
--- a/bin/tests/system/dupsigs/setup.sh
+++ b/bin/tests/system/dupsigs/setup.sh
@@ -10,7 +10,7 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -f clean.sh && $SHELL clean.sh
+$SHELL clean.sh
 
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 

diff --git a/bin/tests/system/ecdsa/setup.sh b/bin/tests/system/ecdsa/setup.sh
index 7fba74b583673be60990d51fdc2430164b908f2a..c47b1aab9f570219069c5e565f3c0364bfe2ce80 100644 (file)
--- a/bin/tests/system/ecdsa/setup.sh
+++ b/bin/tests/system/ecdsa/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 cd ns1 && $SHELL sign.sh

diff --git a/bin/tests/system/eddsa/setup.sh b/bin/tests/system/eddsa/setup.sh
index 7fba74b583673be60990d51fdc2430164b908f2a..c47b1aab9f570219069c5e565f3c0364bfe2ce80 100644 (file)
--- a/bin/tests/system/eddsa/setup.sh
+++ b/bin/tests/system/eddsa/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 cd ns1 && $SHELL sign.sh

diff --git a/bin/tests/system/gost/setup.sh b/bin/tests/system/gost/setup.sh
index 7fba74b583673be60990d51fdc2430164b908f2a..c47b1aab9f570219069c5e565f3c0364bfe2ce80 100644 (file)
--- a/bin/tests/system/gost/setup.sh
+++ b/bin/tests/system/gost/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 cd ns1 && $SHELL sign.sh

diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh
index 21df2e6bcd604883abee4554adaf3662c383e7cf..475671e4888ff0d44663479a8f1c98d0ed2b02f3 100644 (file)
--- a/bin/tests/system/ixfr/setup.sh
+++ b/bin/tests/system/ixfr/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 rm -f ns1/*.db ns1/*.jnl ns3/*.jnl ns4/*.db ns4/*.jnl
 
 cat <<EOF >ns1/named.conf

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index 872186cedef1173d53626b6e402efb927c5a140b..85842ca97e249b0d9b1108c6c0ae2bfba8f213a0 100755 (executable)
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -12,6 +12,8 @@
 # shellcheck source=conf.sh
 . "$SYSTEMTESTTOP/conf.sh"
 
+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh
index 46e2668fd3a0432c7be901eee11dadf568b775ad..ef97541e67e9726d66f04086b7f1c284d47f70eb 100644 (file)
--- a/bin/tests/system/metadata/setup.sh
+++ b/bin/tests/system/metadata/setup.sh
@@ -12,7 +12,7 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-$SHELL ./clean.sh
+$SHELL clean.sh
 
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 

diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh
index 45b6365107400fe9faf72a060bae051487d84e3d..0dc618c6dd3054cb8f4dc6db50928b09e5f69051 100644 (file)
--- a/bin/tests/system/pending/setup.sh
+++ b/bin/tests/system/pending/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/pkcs11/setup.sh b/bin/tests/system/pkcs11/setup.sh
index 4fc5ec5b992e57fe1922f93eb6d57fb07e6bd362..1d7325ae8a468feef79a3d218313675c6a37d560 100644 (file)
--- a/bin/tests/system/pkcs11/setup.sh
+++ b/bin/tests/system/pkcs11/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 infile=ns1/example.db.in
 
 /bin/echo -n ${HSMPIN:-1234}> pin

diff --git a/bin/tests/system/pkcs11ssl/setup.sh b/bin/tests/system/pkcs11ssl/setup.sh
index d2fbe922c7e0b34aa7ab9c77f5c0699a0ae4d519..65857356d750401b8a23e6c0846b7bfdd92578ba 100644 (file)
--- a/bin/tests/system/pkcs11ssl/setup.sh
+++ b/bin/tests/system/pkcs11ssl/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 infile=ns1/example.db.in
 
 /bin/echo -n ${HSMPIN:-1234}> pin

diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh
index 9926dc69764239f9be18465882c4a37e4ec0ef2a..0f9605ef1110986bf45b58408835e82cf505ff12 100644 (file)
--- a/bin/tests/system/resolver/setup.sh
+++ b/bin/tests/system/resolver/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE
 
 cp ns4/tld1.db ns4/tld.db

diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh
index c8865d60070948baee391f098718b9937165dfad..8c01ec47090bc891fdcfd685614f481fb8a0f29d 100755 (executable)
--- a/bin/tests/system/staticstub/setup.sh
+++ b/bin/tests/system/staticstub/setup.sh
@@ -12,6 +12,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
+$SHELL clean.sh
+
 copy_setports ns1/named.conf.in ns1/named.conf
 copy_setports ns2/named.conf.in tmp
 sed 's/SERVER_CONFIG_PLACEHOLDER/server-names { "ns.example.net"; };/' tmp > ns2/named.conf

diff --git a/bin/tests/system/stress/setup.sh b/bin/tests/system/stress/setup.sh
index b1798a4bb7aee65f6a5d8b5a86eea2f1efcb1afd..3860848b9d310dbabe60d727003cca4ad727da45 100644 (file)
--- a/bin/tests/system/stress/setup.sh
+++ b/bin/tests/system/stress/setup.sh
@@ -9,6 +9,11 @@
 # See the COPYRIGHT file distributed with this work for additional
 # information regarding copyright ownership.
 
+# shellcheck source=conf.sh
+. "$SYSTEMTESTTOP/conf.sh"
+
+$SHELL clean.sh
+
 #
 # Set up test data for zone transfer quota tests.
 #