Remove invocations and mentions of clean.sh

(cherry picked from commit f2cb2e57231262835caf2fc44097bbf7f3e1ed4f)

diff --git a/bin/tests/system/README b/bin/tests/system/README
index 14f99088dcaa626da7379f6f8393ebb2179972b4..be42bea54e8984aa48e34392e2f32cc4cfd62f40 100644 (file)
--- a/bin/tests/system/README
+++ b/bin/tests/system/README
@@ -284,24 +284,8 @@ allowing the output that caused the problem message to be identified.
 Re-Running the Tests
 ---
 If there is a requirement to re-run a test (or the entire test suite), the
-files produced by the tests should be deleted first.  Normally, these files are
-deleted if the test succeeds but are retained on error.  The legacy.run.sh
-script automatically calls a given test's clean.sh script before invoking its
-setup.sh script.
-
-Deletion of the files produced by the set of tests (e.g. after the execution
-of "runall.sh") can be carried out using the command:
-
-    sh cleanall.sh
-
-or
-
-    make testclean
-
-(Note that the Makefile has two other targets for cleaning up files: "clean"
-will delete all the files produced by the tests, as well as the object and
-executable files used by the tests.  "distclean" does all the work of "clean"
-as well as deleting configuration files produced by "configure".)
+files produced by the tests should be deleted first. This is no longer
+supported by the legacy runner and the pytest runner should be used instead.
 
 
 Developer Notes
@@ -337,11 +321,6 @@ tests.sh    Runs the actual tests.  This file is mandatory.
 
 tests_sh_xyz.py  A glue file for the pytest runner for executing shell tests.
 
-clean.sh    Run at the end to clean up temporary files, but only if the test
-            was completed successfully and its running was not inhibited by the
-            "-n" switch being passed to "legacy.run.sh".  Otherwise the
-            temporary files are left in place for inspection.
-
 ns<N>       These subdirectories contain test name servers that can be queried
            or can interact with each other.  The value of N indicates the
            address the server listens on: for example, ns2 listens on
@@ -424,7 +403,6 @@ arguments, e.g.:
    (cd mytest ; sh prereq.sh -D xyz)
    (cd mytest ; sh setup.sh -D xyz)
    (cd mytest ; sh tests.sh -D xyz)
-   (cd mytest ; sh clean.sh -D xyz)
 
 No arguments will be passed to the test scripts if the test is run as part of
 a run of the full test suite (e.g. the tests are started with "runall.sh").
@@ -567,12 +545,6 @@ following contents.
     def test_xyz(run_tests_sh):
         run_tests_sh()
 
-clean.sh
----
-The inverse of "setup.sh", this is invoked by the framework to clean up the
-test directory.  It should delete all files that have been created by the test
-during its run.
-
 
 Starting Nameservers
 ---
@@ -854,15 +826,4 @@ abnormally, e.g. core files, PID files etc., are stored in the test directory.
 test is written to bin/tests/system/.  This file is only produced when the test
 is run as part of the entire test suite (e.g. via "runall.sh").
 
-If the test fails, all these files are retained.  But if the test succeeds,
-they are cleaned up at different times:
-
-1. Files generated by the test itself are cleaned up by the test's own
-"clean.sh", which is called from "legacy.run.sh".
-
-2. Files that may not be cleaned up if named exits abnormally can be removed
-using the "cleanall.sh" script.
-
-3. "test.output.*" files are deleted when the test suite ends.  At this point,
-the file "testsummary.sh" is called which concatenates all the "test.output.*"
-files into a single "systests.output" file before deleting them.
+If the test fails, all these files are retained.

diff --git a/bin/tests/system/acl/setup.sh b/bin/tests/system/acl/setup.sh
index 7dcd87244bc8144aa49a4eadfa65ccdde3e7fcde..f563d78cddaccadccaef41103794d5a2088b16ab 100644 (file)
--- 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 2cbc08d7e97bf2fdf8583d75890e2e73c3c8fef5..d117b4c062e4704b3a6a80d6576b5ebd4431062b 100644 (file)
--- 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 eb2e53bd1a3af177a6cc51301e3b8aa5d1bf683c..c33ce7f1c163755eeabc83acbb1bd91ef7acdbdf 100644 (file)
--- 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 848f0c822f4fea6e1bf8ec7c0b2ca767480e451c..0fc415e997fc535557b8feab5c19caf1e88c7f4f 100644 (file)
--- 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 d80e746223e102af0bbdf4a75a8da4177c443bc5..25f05ef33f56827ffa63f66506d6b771f5d2cb27 100644 (file)
--- 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.common b/bin/tests/system/conf.sh.common
index c491a6926ebf1c0d4834daa43eb8f4d2e55abec8..9022e4a41885c32a7dfd09b799feb4e88315ca73 100644 (file)
--- a/bin/tests/system/conf.sh.common
+++ b/bin/tests/system/conf.sh.common
@@ -432,8 +432,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 e24e2d3b2f25f2378cbe6114ccd174fa54418809..2f48648fbff0068d958fcb531a5142df5ce54fa4 100644 (file)
--- a/bin/tests/system/conftest.py
+++ b/bin/tests/system/conftest.py
@@ -375,8 +375,6 @@ def system_test_dir(request, env, 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 9676770adbfe270ea9930bf607503149195e6b7e..7c9de7a6e75e8cc4351921e177a5ffdac8a72059 100644 (file)
--- 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 db0913d369a3289ebeea97765af91ddf59f926ba..dc53ea83e2501cdffc0fb1f56b1fdc00a28eacdc 100644 (file)
--- 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/dupsigs/setup.sh b/bin/tests/system/dupsigs/setup.sh
index 563de434d27291562778d592e949b787d6dcbd53..4e45a8ea1c180e63e2f6bedda6bf3af5313ac91f 100644 (file)
--- a/bin/tests/system/dupsigs/setup.sh
+++ b/bin/tests/system/dupsigs/setup.sh
@@ -13,8 +13,6 @@
 
 . ../conf.sh
 
-$SHELL clean.sh
-
 test -r $RANDFILE || $GENRANDOM 800 $RANDFILE
 
 copy_setports ns1/named.conf.in ns1/named.conf

diff --git a/bin/tests/system/emptyzones/setup.sh b/bin/tests/system/emptyzones/setup.sh
index 935067fb45bccaac4a75f835f3de1f31f8a9e932..f3f0088a238cbaba4e50a0b3cfd42579247ad730 100644 (file)
--- 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/forward/setup.sh b/bin/tests/system/forward/setup.sh
index 33d33ccc9ad41c192d1b0bcad7875cb1074e0d46..5715e9ad097e78caec453087f74a499f81426252 100644 (file)
--- 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
 copy_setports ns2/named.conf.in ns2/named.conf
 copy_setports ns3/named1.conf.in ns3/named.conf

diff --git a/bin/tests/system/geoip2/setup.sh b/bin/tests/system/geoip2/setup.sh
index a0eaaf713b0e3b2bfadd91307e7a174905929ccc..b9ec49f29d123144e5997bdc68706d807a3c8afd 100644 (file)
--- 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 2ac2ce8f0dc69863932b268abacdbb21865dec37..82240a7c1b9ee7a923cd09b9f2a29f7b0d8c377c 100644 (file)
--- 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 643e872ba1d8227f0d737ed83d3919e5a05ed9d8..3638ba5e5aa19f00dd289b2acb1e98f14e56e7c5 100644 (file)
--- 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 0c5a2829f2b7e79c7aa82d235fadedc4a5e4a3f1..5b544411b0ebf321e68d072b0548d47fa87ddc89 100644 (file)
--- 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 6017f1c3b2c2c4f2c0313eff05618b6aea7d76f2..e50cd82f03ad58cf9b179d7035c187f6571576a0 100644 (file)
--- 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 1d11ba96fd3073c9f3f6f18273e272524bf5edf1..0922afa944e298062e4ae3e2cd7c74aaf7ccf9db 100644 (file)
--- 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 fcde4e1036951ccb09e9990cb0fcd568f5620607..2460fd784ea2154fb8a2fa2c19ecbc33b2dd7718 100644 (file)
--- 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 7ad9bb0bbd5dccea39ddd79c6248dd69958af64a..8884af7dc7816fe30f19ef66ab6c4bd9904e3df9 100644 (file)
--- 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 46c18c406abca68b6985dfb3ab17669a2410e0c3..6929ec541d655be0ca4781a5ce59abc6d8bd8aac 100644 (file)
--- 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 f5d52cf23b992e9de92dc00386db30114385bdd6..99556f50020c0df1536e0aebb40ae615a02e5078 100755 (executable)
--- 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 21d10931f4aadc50416335b7200f9f11159106dc..134c4ad0c1c541942f22a52cbfc1d6caeb4ecf35 100644 (file)
--- 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 3019361f08fbd84e38c3efb4996c499e5a2b42f2..41b0bb207531477ca777d3317dd182a58ba50652 100644 (file)
--- 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 67d3ccf642cdac995d39afc8d2570ff090c76686..5989f880c991dc74773588f868140e406388e4f9 100644 (file)
--- 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 e901ea05b897eca20c8f66361480de9cfd328ea2..4ee045facc391945b640652665fc81148743fc3c 100644 (file)
--- 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
-
 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/padding/setup.sh b/bin/tests/system/padding/setup.sh
index 594ae98d9d572ccf522d964f8eed837cfd803aee..eb37490200cb99d66d986fe25b96e82d3eb53ab0 100644 (file)
--- 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 bf57f903693d76e2d6924a593b7989360dce6250..f16857c943a4fc0946fa084075dbb1647cd9d25f 100644 (file)
--- 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 49a642683d482bd6f618d13b43de3715398347e6..b0cb266ec7e890f7107d6ac9dd43b0fbf225e82a 100644 (file)
--- 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/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index d1528e85eec459ddef65990798d81448f1376e7d..1fb9e0f84a1caeb64f3309b8340396304619cda0 100644 (file)
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -17,8 +17,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 8d21434148944a4dc6b1f3c837fb6969386c9ac0..68615c4c195f334eb97b5c0d4c3bd9b3c5d4b80e 100644 (file)
--- a/bin/tests/system/rpzrecurse/setup.sh
+++ b/bin/tests/system/rpzrecurse/setup.sh
@@ -17,8 +17,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 49a642683d482bd6f618d13b43de3715398347e6..b0cb266ec7e890f7107d6ac9dd43b0fbf225e82a 100644 (file)
--- 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 fbb1a38f9dc243be883ef80c54dac873af6fdfb5..5d12d6ac9569e812e0a049cfe83ec5334ca37964 100644 (file)
--- 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 1b0cfc2c6ec268aaff901b4b60d54d25b5f35b1e..234f6489ba151c41dce2b3e5e087858c944156bd 100644 (file)
--- 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 42e1ac8164a25972d8fe636e5ea7bddf9f831436..ad6073a793a3b8f1d4b556c10dfda2b112cef2af 100644 (file)
--- 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 475f399048358604c1dabd0229f76f0fa04673c8..1c587b5d3992fa2a96856d0acb5d46cf108ff936 100644 (file)
--- 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 f726f7020d0ab9b35abb9e6937834e7a1e51d4e6..c62497b30bf77a6d9c478136350d818e251fd39f 100644 (file)
--- 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 f726f7020d0ab9b35abb9e6937834e7a1e51d4e6..c62497b30bf77a6d9c478136350d818e251fd39f 100644 (file)
--- 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 cd90cee785b5103533858d68f59848109dbef95a..4eed3fc5826b4f295471e511886e09b6f52750ad 100644 (file)
--- a/bin/tests/system/tsig/setup.sh
+++ b/bin/tests/system/tsig/setup.sh
@@ -13,8 +13,6 @@
 
 . ../conf.sh
 
-$SHELL clean.sh
-
 copy_setports ns1/named.conf.in ns1/named.conf
 
 if $FEATURETEST --md5; then

diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh
index 0353cb50ef54189bccaba0e1a5237c6e47ff25f8..af9dcfe1911be0813fe764a239487649d32cda1b 100644 (file)
--- 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 ffefaf3c9222bcd8577b455065b7b59191b356e8..785168632547bdbae1516d4c09e72ef407a35636 100644 (file)
--- 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 b20159d918c74a05962c803bfb4fd34f20efb5d7..1aa4e44eea7d8b195831272342aadeea02cd87be 100644 (file)
--- a/doc/dev/dev.md
+++ b/doc/dev/dev.md
@@ -181,10 +181,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