From: Nicki Křížek Date: Mon, 26 Aug 2024 13:46:21 +0000 (+0200) Subject: Remove invocations and mentions of clean.sh X-Git-Tag: v9.21.3~40^2 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=f2cb2e57231262835caf2fc44097bbf7f3e1ed4f;p=thirdparty%2Fbind9.git Remove invocations and mentions of clean.sh --- diff --git a/bin/tests/system/acl/setup.sh b/bin/tests/system/acl/setup.sh index 7dcd87244bc..f563d78cdda 100644 --- a/bin/tests/system/acl/setup.sh +++ b/bin/tests/system/acl/setup.sh @@ -13,7 +13,6 @@ . ../conf.sh -$SHELL clean.sh $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/example.db $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 2 3 >ns2/tsigzone.db copy_setports ns2/named1.conf.in ns2/named.conf diff --git a/bin/tests/system/additional/setup.sh b/bin/tests/system/additional/setup.sh index 2cbc08d7e97..d117b4c062e 100644 --- a/bin/tests/system/additional/setup.sh +++ b/bin/tests/system/additional/setup.sh @@ -13,7 +13,6 @@ . ../conf.sh -$SHELL clean.sh copy_setports ns1/named1.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/catz/setup.sh b/bin/tests/system/catz/setup.sh index eb2e53bd1a3..c33ce7f1c16 100644 --- a/bin/tests/system/catz/setup.sh +++ b/bin/tests/system/catz/setup.sh @@ -13,8 +13,6 @@ . ../conf.sh -$SHELL clean.sh - copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named1.conf.in ns2/named.conf copy_setports ns3/named.conf.in ns3/named.conf diff --git a/bin/tests/system/checkds/setup.sh b/bin/tests/system/checkds/setup.sh index 848f0c822f4..0fc415e997f 100644 --- a/bin/tests/system/checkds/setup.sh +++ b/bin/tests/system/checkds/setup.sh @@ -16,8 +16,6 @@ set -e -$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/checknames/setup.sh b/bin/tests/system/checknames/setup.sh index d80e746223e..25f05ef33f5 100644 --- a/bin/tests/system/checknames/setup.sh +++ b/bin/tests/system/checknames/setup.sh @@ -13,8 +13,6 @@ . ../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/conf.sh b/bin/tests/system/conf.sh index 320cf647952..40ca8210de9 100644 --- a/bin/tests/system/conf.sh +++ b/bin/tests/system/conf.sh @@ -232,8 +232,7 @@ private_type_record() { # has been appended since the last time we read it. # # Calling some of these functions causes temporary *.prev files to be -# created that need to be cleaned up manually (usually by a given system -# test's clean.sh script). +# created. # # Note that unlike other nextpart*() functions, nextpartread() is not # meant to be directly used in system tests; its sole purpose is to diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py index e4fd7c76258..e5cbd3f3263 100644 --- a/bin/tests/system/conftest.py +++ b/bin/tests/system/conftest.py @@ -326,8 +326,6 @@ def system_test_dir(request, system_test_name, expected_artifacts): This fixture is responsible for creating (and potentially removing) a copy of the system test directory which is used as a temporary directory for the test execution. - - FUTURE: This removes the need to have clean.sh scripts. """ def get_test_result(): diff --git a/bin/tests/system/cpu/setup.sh b/bin/tests/system/cpu/setup.sh index 9676770adbf..7c9de7a6e75 100644 --- a/bin/tests/system/cpu/setup.sh +++ b/bin/tests/system/cpu/setup.sh @@ -16,6 +16,4 @@ set -e -$SHELL clean.sh - copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh index db0913d369a..dc53ea83e25 100644 --- a/bin/tests/system/dnssec/setup.sh +++ b/bin/tests/system/dnssec/setup.sh @@ -16,8 +16,6 @@ set -e -$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/emptyzones/setup.sh b/bin/tests/system/emptyzones/setup.sh index 935067fb45b..f3f0088a238 100644 --- a/bin/tests/system/emptyzones/setup.sh +++ b/bin/tests/system/emptyzones/setup.sh @@ -13,5 +13,4 @@ . ../conf.sh -$SHELL clean.sh copy_setports ns1/named1.conf.in ns1/named.conf diff --git a/bin/tests/system/enginepkcs11/setup.sh b/bin/tests/system/enginepkcs11/setup.sh index 81de061d060..dac6e4c7c57 100644 --- a/bin/tests/system/enginepkcs11/setup.sh +++ b/bin/tests/system/enginepkcs11/setup.sh @@ -16,8 +16,6 @@ set -e -$SHELL clean.sh - OPENSSL_CONF= softhsm2-util --delete-token --token "softhsm2-enginepkcs11" >/dev/null 2>&1 || true OPENSSL_CONF= softhsm2-util --init-token --free --pin 1234 --so-pin 1234 --label "softhsm2-enginepkcs11" | awk '/^The token has been initialized and is reassigned to slot/ { print $NF }' diff --git a/bin/tests/system/forward/setup.sh b/bin/tests/system/forward/setup.sh index 3a9eb5e6b2f..4251008b400 100644 --- a/bin/tests/system/forward/setup.sh +++ b/bin/tests/system/forward/setup.sh @@ -13,7 +13,6 @@ . ../conf.sh -$SHELL clean.sh copy_setports ns1/named.conf.in ns1/named.conf if $FEATURETEST --have-fips-dh; then diff --git a/bin/tests/system/geoip2/setup.sh b/bin/tests/system/geoip2/setup.sh index a0eaaf713b0..b9ec49f29d1 100644 --- a/bin/tests/system/geoip2/setup.sh +++ b/bin/tests/system/geoip2/setup.sh @@ -13,8 +13,6 @@ . ../conf.sh -$SHELL clean.sh - copy_setports ns2/named1.conf.in ns2/named.conf for i in 1 2 3 4 5 6 7 other bogus; do diff --git a/bin/tests/system/idna/setup.sh b/bin/tests/system/idna/setup.sh index 2ac2ce8f0dc..82240a7c1b9 100644 --- a/bin/tests/system/idna/setup.sh +++ b/bin/tests/system/idna/setup.sh @@ -13,5 +13,4 @@ . ../conf.sh -$SHELL clean.sh copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/include-multiplecfg/setup.sh b/bin/tests/system/include-multiplecfg/setup.sh index 643e872ba1d..3638ba5e5aa 100644 --- a/bin/tests/system/include-multiplecfg/setup.sh +++ b/bin/tests/system/include-multiplecfg/setup.sh @@ -13,6 +13,4 @@ . ../conf.sh -$SHELL clean.sh - copy_setports ns2/named.conf.in ns2/named.conf diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh index 0c5a2829f2b..5b544411b0e 100644 --- a/bin/tests/system/ixfr/setup.sh +++ b/bin/tests/system/ixfr/setup.sh @@ -13,8 +13,6 @@ . ../conf.sh -$SHELL clean.sh - copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns3/named.conf.in ns3/named.conf copy_setports ns4/named.conf.in ns4/named.conf diff --git a/bin/tests/system/journal/setup.sh b/bin/tests/system/journal/setup.sh index 6017f1c3b2c..e50cd82f03a 100644 --- a/bin/tests/system/journal/setup.sh +++ b/bin/tests/system/journal/setup.sh @@ -13,8 +13,6 @@ . ../conf.sh -$SHELL clean.sh - copy_setports ns1/named.conf.in ns1/named.conf cp ns1/generic.db.in ns1/changed.db cp ns1/changed.ver1.jnl.saved ns1/changed.db.jnl diff --git a/bin/tests/system/kasp/setup.sh b/bin/tests/system/kasp/setup.sh index 321fd689d73..ccc45334d97 100644 --- a/bin/tests/system/kasp/setup.sh +++ b/bin/tests/system/kasp/setup.sh @@ -16,8 +16,6 @@ set -e -$SHELL clean.sh - mkdir keys mkdir ns3/keys diff --git a/bin/tests/system/legacy/build.sh b/bin/tests/system/legacy/build.sh index fcde4e10369..2460fd784ea 100644 --- a/bin/tests/system/legacy/build.sh +++ b/bin/tests/system/legacy/build.sh @@ -13,9 +13,5 @@ . ../conf.sh -$SHELL clean.sh - (cd ns6 && $SHELL -e sign.sh) (cd ns7 && $SHELL -e sign.sh) - -$SHELL clean.sh diff --git a/bin/tests/system/logfileconfig/setup.sh b/bin/tests/system/logfileconfig/setup.sh index 7ad9bb0bbd5..8884af7dc78 100644 --- a/bin/tests/system/logfileconfig/setup.sh +++ b/bin/tests/system/logfileconfig/setup.sh @@ -13,6 +13,4 @@ . ../conf.sh -$SHELL clean.sh - copy_setports ns1/named.plain.in ns1/named.conf diff --git a/bin/tests/system/masterfile/setup.sh b/bin/tests/system/masterfile/setup.sh index 46c18c406ab..6929ec541d6 100644 --- a/bin/tests/system/masterfile/setup.sh +++ b/bin/tests/system/masterfile/setup.sh @@ -13,6 +13,5 @@ . ../conf.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/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh index f5d52cf23b9..99556f50020 100755 --- a/bin/tests/system/masterformat/setup.sh +++ b/bin/tests/system/masterformat/setup.sh @@ -14,8 +14,6 @@ # shellcheck source=conf.sh . ../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/mirror/setup.sh b/bin/tests/system/mirror/setup.sh index 21d10931f4a..134c4ad0c1c 100644 --- a/bin/tests/system/mirror/setup.sh +++ b/bin/tests/system/mirror/setup.sh @@ -13,8 +13,6 @@ . ../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/nsec3/setup.sh b/bin/tests/system/nsec3/setup.sh index 33772fd3f6b..f995033e5f6 100644 --- a/bin/tests/system/nsec3/setup.sh +++ b/bin/tests/system/nsec3/setup.sh @@ -16,8 +16,6 @@ set -e -$SHELL clean.sh - copy_setports ns2/named.conf.in ns2/named.conf ( cd ns2 diff --git a/bin/tests/system/nslookup/setup.sh b/bin/tests/system/nslookup/setup.sh index 67d3ccf642c..5989f880c99 100644 --- a/bin/tests/system/nslookup/setup.sh +++ b/bin/tests/system/nslookup/setup.sh @@ -13,8 +13,6 @@ . ../conf.sh -$SHELL clean.sh - $SHELL ${TOP_SRCDIR}/bin/tests/system/genzone.sh 1 >ns1/example.db copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh index 6ea5a660274..38942ba2970 100644 --- a/bin/tests/system/nsupdate/setup.sh +++ b/bin/tests/system/nsupdate/setup.sh @@ -13,11 +13,6 @@ . ../conf.sh -# -# jnl and database files MUST be removed before we start -# -$SHELL clean.sh - if $FEATURETEST --have-fips-dh; then copy_setports ns1/tls.conf.in ns1/tls.conf copy_setports ns1/tls.options.in ns1/tls.options diff --git a/bin/tests/system/padding/setup.sh b/bin/tests/system/padding/setup.sh index 594ae98d9d5..eb37490200c 100644 --- a/bin/tests/system/padding/setup.sh +++ b/bin/tests/system/padding/setup.sh @@ -13,8 +13,6 @@ . ../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/pending/setup.sh b/bin/tests/system/pending/setup.sh index bf57f903693..f16857c943a 100644 --- a/bin/tests/system/pending/setup.sh +++ b/bin/tests/system/pending/setup.sh @@ -13,8 +13,6 @@ . ../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/pipelined/setup.sh b/bin/tests/system/pipelined/setup.sh index 49a642683d4..b0cb266ec7e 100644 --- a/bin/tests/system/pipelined/setup.sh +++ b/bin/tests/system/pipelined/setup.sh @@ -13,8 +13,6 @@ . ../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/proxy/setup.sh b/bin/tests/system/proxy/setup.sh index b54f6210778..7857c71ec7a 100644 --- a/bin/tests/system/proxy/setup.sh +++ b/bin/tests/system/proxy/setup.sh @@ -14,8 +14,6 @@ # shellcheck disable=SC1091 . ../conf.sh -$SHELL clean.sh - $SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns1/example.db $SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns3/example.db diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh index 418e824e573..1345e2e13f1 100644 --- a/bin/tests/system/rpz/setup.sh +++ b/bin/tests/system/rpz/setup.sh @@ -15,8 +15,6 @@ set -e . ../conf.sh -$SHELL clean.sh - for dir in ns*; do touch $dir/named.run nextpart $dir/named.run >/dev/null diff --git a/bin/tests/system/rpzrecurse/setup.sh b/bin/tests/system/rpzrecurse/setup.sh index a34b7c3b002..b08beedf41f 100644 --- a/bin/tests/system/rpzrecurse/setup.sh +++ b/bin/tests/system/rpzrecurse/setup.sh @@ -15,8 +15,6 @@ set -e . ../conf.sh -$SHELL clean.sh - $PERL testgen.pl copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/rrl/setup.sh b/bin/tests/system/rrl/setup.sh index 49a642683d4..b0cb266ec7e 100644 --- a/bin/tests/system/rrl/setup.sh +++ b/bin/tests/system/rrl/setup.sh @@ -13,8 +13,6 @@ . ../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/rrsetorder/setup.sh b/bin/tests/system/rrsetorder/setup.sh index fbb1a38f9dc..5d12d6ac956 100644 --- a/bin/tests/system/rrsetorder/setup.sh +++ b/bin/tests/system/rrsetorder/setup.sh @@ -13,7 +13,6 @@ . ../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/runtime/setup.sh b/bin/tests/system/runtime/setup.sh index dbc69b67a54..a0fc0d08b5a 100644 --- a/bin/tests/system/runtime/setup.sh +++ b/bin/tests/system/runtime/setup.sh @@ -13,8 +13,6 @@ . ../conf.sh -$SHELL clean.sh - copy_setports ns2/named1.conf.in ns2/named.conf copy_setports ns2/named-alt1.conf.in ns2/named-alt1.conf diff --git a/bin/tests/system/serve-stale/setup.sh b/bin/tests/system/serve-stale/setup.sh index 42e1ac8164a..ad6073a793a 100644 --- a/bin/tests/system/serve-stale/setup.sh +++ b/bin/tests/system/serve-stale/setup.sh @@ -13,8 +13,6 @@ . ../conf.sh -$SHELL clean.sh - copy_setports ns1/named1.conf.in ns1/named.conf copy_setports ns3/named.conf.in ns3/named.conf copy_setports ns4/named.conf.in ns4/named.conf diff --git a/bin/tests/system/tcp/setup.sh b/bin/tests/system/tcp/setup.sh index 475f3990483..1c587b5d399 100644 --- a/bin/tests/system/tcp/setup.sh +++ b/bin/tests/system/tcp/setup.sh @@ -13,8 +13,6 @@ . ../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/transport-acl/setup.sh b/bin/tests/system/transport-acl/setup.sh index f726f7020d0..c62497b30bf 100644 --- a/bin/tests/system/transport-acl/setup.sh +++ b/bin/tests/system/transport-acl/setup.sh @@ -14,8 +14,6 @@ # shellcheck disable=SC1091 . ../conf.sh -$SHELL clean.sh - $SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns1/example.db copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/transport-change/setup.sh b/bin/tests/system/transport-change/setup.sh index f726f7020d0..c62497b30bf 100644 --- a/bin/tests/system/transport-change/setup.sh +++ b/bin/tests/system/transport-change/setup.sh @@ -14,8 +14,6 @@ # shellcheck disable=SC1091 . ../conf.sh -$SHELL clean.sh - $SHELL "${TOP_SRCDIR}"/bin/tests/system/genzone.sh 2 >ns1/example.db copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/tsig/setup.sh b/bin/tests/system/tsig/setup.sh index 671aff99427..37eb617128b 100644 --- a/bin/tests/system/tsig/setup.sh +++ b/bin/tests/system/tsig/setup.sh @@ -13,8 +13,6 @@ . ../conf.sh -$SHELL clean.sh - if $FEATURETEST --md5; then copy_setports ns1/named-fips.conf.in ns1/named-fips.conf # includes named-fips.conf diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh index 0353cb50ef5..af9dcfe1911 100644 --- a/bin/tests/system/tsiggss/setup.sh +++ b/bin/tests/system/tsiggss/setup.sh @@ -13,8 +13,6 @@ . ../conf.sh -$SHELL clean.sh - copy_setports ns1/named.conf.in ns1/named.conf key=$($KEYGEN -Cq -K ns1 -a $DEFAULT_ALGORITHM -b $DEFAULT_BITS -n HOST -T KEY key.example.nil.) diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh index ffefaf3c922..78516863254 100644 --- a/bin/tests/system/zonechecks/setup.sh +++ b/bin/tests/system/zonechecks/setup.sh @@ -13,8 +13,6 @@ . ../conf.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/doc/dev/dev.md b/doc/dev/dev.md index e1c3960b5a3..fe88ea95e98 100644 --- a/doc/dev/dev.md +++ b/doc/dev/dev.md @@ -176,10 +176,6 @@ The following standard files are found in system test directories: - `tests.sh`: runs all the test cases. A non-zero return value results in R:FAIL -- `clean.sh`: run at the end to clean up temporary files, but only if the - test was completed successfully; otherwise the temporary files are left - in place for inspection. - - `ns[X]`: these subdirectories contain test name servers that can be queried or can interact with each other. (For example, `ns1` might be running as a root server, `ns2` as a TLD server, and `ns3` as a recursive