From: Michał Kępień Date: Thu, 28 Feb 2019 11:33:07 +0000 (+0100) Subject: Call clean.sh from all relevant setup.sh scripts X-Git-Tag: v9.15.0~134^2 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=a077a3ae8a5013e089bb4e6f9ab8137c5b708dce;p=thirdparty%2Fbind9.git 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. --- diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh index d031d28e779..6fcf812bd73 100644 --- 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 copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf diff --git a/bin/tests/system/case/setup.sh b/bin/tests/system/case/setup.sh index 066ceb2e0dc..53f01c4fc53 100644 --- 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 24f8d29ed4b..e4737d47d58 100644 --- 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 + copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns3/named.conf.in ns3/named.conf diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh index 6efd9400922..5e3c38ef38a 100644 --- 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 + $DDNSCONFGEN -q -z example.nil > ns1/ddns.key copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/dsdigest/setup.sh b/bin/tests/system/dsdigest/setup.sh index e8a39a0196d..7e353f11b24 100644 --- 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 + copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns3/named.conf.in ns3/named.conf diff --git a/bin/tests/system/dupsigs/setup.sh b/bin/tests/system/dupsigs/setup.sh index 0c37928a85f..ba7af73c472 100644 --- 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 800 $RANDFILE diff --git a/bin/tests/system/ecdsa/setup.sh b/bin/tests/system/ecdsa/setup.sh index f5482e6c38c..c3c38c3f2f4 100644 --- a/bin/tests/system/ecdsa/setup.sh +++ b/bin/tests/system/ecdsa/setup.sh @@ -12,4 +12,6 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + cd ns1 && $SHELL sign.sh diff --git a/bin/tests/system/eddsa/setup.sh b/bin/tests/system/eddsa/setup.sh index f5482e6c38c..c3c38c3f2f4 100644 --- a/bin/tests/system/eddsa/setup.sh +++ b/bin/tests/system/eddsa/setup.sh @@ -12,4 +12,6 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + cd ns1 && $SHELL sign.sh diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh index 21df2e6bcd6..475671e4888 100644 --- 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 <ns1/named.conf diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh index 572e3fcb2ac..3ac21f154a0 100755 --- 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 + copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns3/named.conf.in ns3/named.conf diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh index 29ed0c3b884..580f7196d26 100644 --- 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 pzone=parent.nil czone=child.parent.nil diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh index 29ad0f07f1e..9037f435ab3 100644 --- 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 + copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf copy_setports ns3/named.conf.in ns3/named.conf diff --git a/bin/tests/system/pkcs11/setup.sh b/bin/tests/system/pkcs11/setup.sh index cd596198a05..e91ca7c34d0 100644 --- 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/resolver/setup.sh b/bin/tests/system/resolver/setup.sh index 1e9456a3273..b15097755b8 100644 --- 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 + cp ns4/tld1.db ns4/tld.db cp ns6/to-be-removed.tld.db.in ns6/to-be-removed.tld.db cp ns7/server.db.in ns7/server.db diff --git a/bin/tests/system/serve-stale/setup.sh b/bin/tests/system/serve-stale/setup.sh index 9157bca2a53..ea77954e808 100644 --- a/bin/tests/system/serve-stale/setup.sh +++ b/bin/tests/system/serve-stale/setup.sh @@ -12,5 +12,7 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + copy_setports ns1/named1.conf.in ns1/named.conf copy_setports ns3/named.conf.in ns3/named.conf diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh index 874e99585b9..90952634dd8 100755 --- 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 b1798a4bb7a..3860848b9d3 100644 --- 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. #