perform a more complete cleanup after running system tests [rt41255]

diff --git a/bin/tests/system/acl/clean.sh b/bin/tests/system/acl/clean.sh
index 381753d4fe1a07cff21f5396156c92764c7c899d..54a8aebe2694900253f793cab72ef96a9d68aee8 100644 (file)
--- a/bin/tests/system/acl/clean.sh
+++ b/bin/tests/system/acl/clean.sh
@@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: clean.sh,v 1.3 2008/01/10 23:47:01 tbox Exp $
-
 #
 # Clean up after zone transfer tests.
 #
@@ -23,4 +21,5 @@
 rm -f dig.out.*
 rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl ns2/named.conf
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns*/named.lock

diff --git a/bin/tests/system/addzone/clean.sh b/bin/tests/system/addzone/clean.sh
index 2f345e91fe54dde60a7925c7cf0ad5eb10e2aa21..24de9cd073c0e46cf4c1ed33e552c661bf98b16e 100644 (file)
--- a/bin/tests/system/addzone/clean.sh
+++ b/bin/tests/system/addzone/clean.sh
@@ -26,4 +26,5 @@ rm -f ns2/inline.db.jbk
 rm -f ns2/inline.db.signed
 rm -f ns2/inlineslave.bk*
 rm -f ns*/named.lock
+rm -f ns*/named.run
 rm -f ns2/nzf-*

diff --git a/bin/tests/system/allow_query/clean.sh b/bin/tests/system/allow_query/clean.sh
index bfe3bc8df37d65d166d6611c16cd5f6931824ddf..dd35610087fad666abd2ab58cc6a1a8d8dc81567 100644 (file)
--- a/bin/tests/system/allow_query/clean.sh
+++ b/bin/tests/system/allow_query/clean.sh
@@ -24,3 +24,4 @@ rm -f dig.out.*
 rm -f ns2/named.conf
 rm -f */named.memstats
 rm -f ns*/named.lock
+rm -f ns*/named.run

diff --git a/bin/tests/system/autosign/clean.sh b/bin/tests/system/autosign/clean.sh
index 11b3a312f554e92d91966a187e822c85b4390196..5db47cae265ef27451ad9d147ffe87d4e4cf1f7f 100644 (file)
--- a/bin/tests/system/autosign/clean.sh
+++ b/bin/tests/system/autosign/clean.sh
@@ -18,6 +18,7 @@ rm -f */K* */dsset-* */*.signed */trusted.conf */tmp* */*.jnl */*.bk
 rm -f */core
 rm -f */example.bk
 rm -f */named.memstats
+rm -f */named.run
 rm -f activate-now-publish-1day.key
 rm -f active.key inact.key del.key unpub.key standby.key rev.key
 rm -f sync.key

diff --git a/bin/tests/system/cacheclean/clean.sh b/bin/tests/system/cacheclean/clean.sh
index e43d003997724e84dcad117ecea7e29048a01228..54d78aa8d64117fc57e97e8c41e6219d53a87ee4 100644 (file)
--- a/bin/tests/system/cacheclean/clean.sh
+++ b/bin/tests/system/cacheclean/clean.sh
@@ -24,5 +24,6 @@
 rm -f dig.out.ns2
 rm -f dig.out.expire
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns2/named_dump.db
 rm -f ns*/named.lock

diff --git a/bin/tests/system/case/clean.sh b/bin/tests/system/case/clean.sh
index 3c1ff36fd76af3e51e263d60fbbdcb1dcc1710d3..7843910dba9f6cfa53ddae84e919aa528159801f 100644 (file)
--- a/bin/tests/system/case/clean.sh
+++ b/bin/tests/system/case/clean.sh
@@ -16,6 +16,8 @@
 
 rm -f dig.ns*.test*
 rm -f ns*/named.lock
+rm -f ns*/named.memstats
+rm -f ns*/named.run
 rm -f ns1/dynamic.db
 rm -f ns1/dynamic.db.jnl
 rm -f ns2/dynamic.bk

diff --git a/bin/tests/system/checknames/clean.sh b/bin/tests/system/checknames/clean.sh
index 2977f9e7d068f3c95a8794381bc4a13ffe82101e..0ca4ca8c3bcfba693ca8f3ff94429c1bfc49c9dd 100644 (file)
--- a/bin/tests/system/checknames/clean.sh
+++ b/bin/tests/system/checknames/clean.sh
@@ -24,4 +24,5 @@ rm -f ns1/*.update.db.jnl
 rm -f ns4/*.update.db
 rm -f ns4/*.update.db.jnl
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns*/named.lock

diff --git a/bin/tests/system/clean.sh b/bin/tests/system/clean.sh
new file mode 100644 (file)
index 0000000..f2cbe5f
--- /dev/null
+++ b/bin/tests/system/clean.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+#
+# Copyright (C) 2015  Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+#
+# Clean up after a specified system test.
+#
+
+SYSTEMTESTTOP=.
+. $SYSTEMTESTTOP/conf.sh
+
+test $# -gt 0 || { echo "usage: $0 test-directory" >&2; exit 1; }
+
+test=$1
+shift
+
+if test -f $test/clean.sh; then
+    ( cd $test && $SHELL clean.sh "$@" )
+fi

diff --git a/bin/tests/system/cookie/clean.sh b/bin/tests/system/cookie/clean.sh
index 090b4982a994572553050570ff4ff84cbcd27fc5..5ebc0a9cf8adf756bf8b27680c80b843f63d6ab2 100644 (file)
--- a/bin/tests/system/cookie/clean.sh
+++ b/bin/tests/system/cookie/clean.sh
@@ -14,4 +14,6 @@
 
 rm -f dig.out.*
 rm -f ns1/named_dump.db
+rm -f ns*/named.memstats
+rm -f ns*/named.run
 rm -f ns*/named.lock

diff --git a/bin/tests/system/dlzexternal/clean.sh b/bin/tests/system/dlzexternal/clean.sh
index 6125ba80953862bcf5d988a318bc01482a0bfc27..47ca4e2db846cdc51155b7bd263a7288b64e4c52 100644 (file)
--- a/bin/tests/system/dlzexternal/clean.sh
+++ b/bin/tests/system/dlzexternal/clean.sh
@@ -20,7 +20,9 @@
 
 rm -f ns1/update.txt
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns1/ddns.key
 rm -f dig.out*
 rm -f ns*/named.lock
 rm -f ns1/session.key
+rm -f ns1/named.conf

diff --git a/bin/tests/system/dname/clean.sh b/bin/tests/system/dname/clean.sh
index 36256485744723d13c5fcf04a883b0649594a1d7..972392794f57137839d0924001a4917b0038589a 100644 (file)
--- a/bin/tests/system/dname/clean.sh
+++ b/bin/tests/system/dname/clean.sh
@@ -20,5 +20,6 @@
 # Clean up after resolver tests.
 #
 rm -f */named.memstats
+rm -f */named.run
 rm -f dig.out.*
 rm -f ns*/named.lock

diff --git a/bin/tests/system/dns64/clean.sh b/bin/tests/system/dns64/clean.sh
index 9012c3edf55ff0dbaa07a846780b15374bbed969..d6725aee6f2ed6cd7583d30ebe54eda9dc5cb48b 100644 (file)
--- a/bin/tests/system/dns64/clean.sh
+++ b/bin/tests/system/dns64/clean.sh
@@ -18,5 +18,6 @@ rm -f ns1/K*
 rm -f ns1/signed.db*
 rm -f ns1/dsset-signed.
 rm -f */named.memstats
+rm -f */named.run
 rm -f dig.out.*
 rm -f ns*/named.lock

diff --git a/bin/tests/system/dscp/clean.sh b/bin/tests/system/dscp/clean.sh
index 9a7fec47c7bac722d1aa75d748567413496370a2..8c2b2550de070f817156c6b646feb408f4552c51 100644 (file)
--- a/bin/tests/system/dscp/clean.sh
+++ b/bin/tests/system/dscp/clean.sh
@@ -14,4 +14,6 @@
 
 rm -f */root.bk
 rm -f dig.out.10.53.0.?
+rm -f */named.memstats
+rm -f */named.run
 rm -f ns*/named.lock

diff --git a/bin/tests/system/ednscompliance/clean.sh b/bin/tests/system/ednscompliance/clean.sh
index e28d82be23d1a266b2d2274c8eb2f1dfbe6447e9..1a54db6d77e756e8cf6e0ec165a59783d8a8958b 100644 (file)
--- a/bin/tests/system/ednscompliance/clean.sh
+++ b/bin/tests/system/ednscompliance/clean.sh
@@ -16,3 +16,5 @@
 
 rm -f dig.out*
 rm -f ns*/named.lock
+rm -f ns*/named.run
+rm -f ns*/named.memstats

diff --git a/bin/tests/system/emptyzones/clean.sh b/bin/tests/system/emptyzones/clean.sh
index 112d099175264433a6ec33216dc100beebe3882f..5b49f51b480a514e21acd11b3db2048f8eee1e08 100644 (file)
--- a/bin/tests/system/emptyzones/clean.sh
+++ b/bin/tests/system/emptyzones/clean.sh
@@ -14,4 +14,6 @@
 
 rm -f ns1/named.conf
 rm -f ns*/named.lock
+rm -f ns*/named.run
+rm -f ns*/named.memstats
 rm -f dig.out.test*

diff --git a/bin/tests/system/fetchlimit/clean.sh b/bin/tests/system/fetchlimit/clean.sh
index 73ed8c8aeadf44e6034875bda7c85f1f2f406b50..8d054303d23ef0ca78f5ce18ed82d061363eab14 100644 (file)
--- a/bin/tests/system/fetchlimit/clean.sh
+++ b/bin/tests/system/fetchlimit/clean.sh
@@ -14,7 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-rm -f */named.memstats */ans.run */named.recursing
+rm -f */named.memstats */ans.run */named.recursing */named.run
 rm -f dig.out*
 rm -f ans4/norespond
 rm -f ns3/named.conf ns3/named.stats ns3/named_dump.db

diff --git a/bin/tests/system/formerr/clean.sh b/bin/tests/system/formerr/clean.sh
index dfe72fe9ca23a69c8bfa422b7fb2c39e3b2cecd7..4082fad61cda44d27903592048bf96248095a039 100644 (file)
--- a/bin/tests/system/formerr/clean.sh
+++ b/bin/tests/system/formerr/clean.sh
@@ -16,3 +16,5 @@ rm -f nametoolong.out
 rm -f twoquestions.out 
 rm -f noquestions.out 
 rm -f ns*/named.lock
+rm -f ns*/named.run
+rm -f ns*/named.memstats

diff --git a/bin/tests/system/forward/clean.sh b/bin/tests/system/forward/clean.sh
index c58d9cab6ad9e97ca3ab1241cb53c6c067d475d4..87b0af617e6c601ec9c15d1b58e85d3fd1cdd7f7 100644 (file)
--- a/bin/tests/system/forward/clean.sh
+++ b/bin/tests/system/forward/clean.sh
@@ -20,4 +20,5 @@
 #
 rm -f dig.out.*
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns*/named.lock

diff --git a/bin/tests/system/glue/clean.sh b/bin/tests/system/glue/clean.sh
index 16329b2f2a623508e31a7c1129d6c0bdb6b70c4d..c7169c42735911ce927557fa4f308c51ce743c9c 100644 (file)
--- a/bin/tests/system/glue/clean.sh
+++ b/bin/tests/system/glue/clean.sh
@@ -23,4 +23,5 @@
 
 rm -f dig.out ns1/cache
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns*/named.lock

diff --git a/bin/tests/system/ixfr/clean.sh b/bin/tests/system/ixfr/clean.sh
index 666c39ef40a076a6ae310987ac3298dc5f89ce71..3193e5e8ea9bb90e90754bb2473e9b76493e398e 100644 (file)
--- a/bin/tests/system/ixfr/clean.sh
+++ b/bin/tests/system/ixfr/clean.sh
@@ -21,6 +21,8 @@ rm -f ns1/named.conf ns1/myftp.db
 rm -f ns3/*.jnl ns3/mytest.db ns3/subtest.db
 rm -f ns4/*.jnl ns4/*.db
 rm -f */named.memstats
+rm -f */named.run
+rm -f */ans.run
 rm -f dig.out dig.out1 dig.out2 dig.out3
 rm -f ns3/large.db
 rm -f ns*/named.lock

diff --git a/bin/tests/system/limits/clean.sh b/bin/tests/system/limits/clean.sh
index e7d8598356ba8f6cc5b62ba63e8905ea7e206429..a8299500d70dab8ee5be9f44c38d072209dc821e 100644 (file)
--- a/bin/tests/system/limits/clean.sh
+++ b/bin/tests/system/limits/clean.sh
@@ -22,4 +22,5 @@
 #
 rm -f dig.out.*
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns*/named.lock

diff --git a/bin/tests/system/lwresd/clean.sh b/bin/tests/system/lwresd/clean.sh
index 5c4d3c2525774a03b88496a980ae505eab0e7667..62c364072e06c5fbf045b5d200ac4530699b883c 100644 (file)
--- a/bin/tests/system/lwresd/clean.sh
+++ b/bin/tests/system/lwresd/clean.sh
@@ -18,7 +18,9 @@
 # Clean up after lwresd tests.
 #
 rm -f */named.memstats
+rm -f */named.run
 rm -f dig.out
 rm -f lwresd1/lwresd.run.resolv
 rm -f ns*/named.lock
 rm -f lwresd*/lwresd.lock
+rm -f lwresd*/lwresd.run

diff --git a/bin/tests/system/masterfile/clean.sh b/bin/tests/system/masterfile/clean.sh
index b54b3155f6e09ef1dea41425ff56b53155ee10df..66e8ce2fa2b01175ecd10e67e451351fc3ba5b91 100644 (file)
--- a/bin/tests/system/masterfile/clean.sh
+++ b/bin/tests/system/masterfile/clean.sh
@@ -19,5 +19,6 @@
 
 rm -f dig.out.*
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns*/named.lock
 rm -f checkzone.out*

diff --git a/bin/tests/system/masterformat/clean.sh b/bin/tests/system/masterformat/clean.sh
index 7ea0762ae9d113d1641f32a7bf9babb54036d307..ad9a71243c07205651cf714c4a836cb6d7c47902 100755 (executable)
--- a/bin/tests/system/masterformat/clean.sh
+++ b/bin/tests/system/masterformat/clean.sh
@@ -24,6 +24,7 @@ rm -f ns1/session.key
 rm -f dig.out.*
 rm -f dig.out
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns2/example.db
 rm -f ns2/transfer.db.*
 rm -f ns2/formerly-text.db

diff --git a/bin/tests/system/names/clean.sh b/bin/tests/system/names/clean.sh
index 8b9242d3645097c3f16dc6d2b9c3e92ddbd84516..4620489ab8032838566306c0abbb083bdd4ef1d2 100644 (file)
--- a/bin/tests/system/names/clean.sh
+++ b/bin/tests/system/names/clean.sh
@@ -17,4 +17,5 @@
 rm -f dig.*.test*
 rm -f ns*/named.lock
 rm -f ns*/named.memstats
+rm -f ns*/named.run
 rm -f ns*/named.pid

diff --git a/bin/tests/system/notify/clean.sh b/bin/tests/system/notify/clean.sh
index 67bfad0136b126a81f1eb64013f82c6009e8006e..d02ad64996f26d90a9a7aace9a3deb344f70f436 100644 (file)
--- a/bin/tests/system/notify/clean.sh
+++ b/bin/tests/system/notify/clean.sh
@@ -20,6 +20,7 @@
 #
 
 rm -f */named.memstats
+rm -f */named.run
 rm -f dig.out.?.ns5.test*
 rm -f dig.out.ns2.test*
 rm -f dig.out.ns3.test*

diff --git a/bin/tests/system/nslookup/clean.sh b/bin/tests/system/nslookup/clean.sh
index b26be62dbf16243a87d283844fa104817c2c1b45..7846461dfa735e7edf5a21081034fc1e1cc58864 100644 (file)
--- a/bin/tests/system/nslookup/clean.sh
+++ b/bin/tests/system/nslookup/clean.sh
@@ -15,3 +15,5 @@
 rm -f ns1/example.db
 rm -f nslookup.out*
 rm -f ns*/named.lock
+rm -f ns*/named.memstats
+rm -f ns*/named.run

diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index 0f092e2dab9f85559e7e80582bf52e8b7388a79a..ae313cbd480fc696dcd93cfe694a82f28b8fc5fd 100644 (file)
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -27,6 +27,7 @@ rm -f nsupdate.out
 rm -f ns2/example.bk
 rm -f ns2/update.bk ns2/update.alt.bk
 rm -f */named.memstats
+rm -f */named.run
 rm -f nsupdate.out*
 rm -f ns3/example.db.jnl ns3/example.db
 rm -f ns3/nsec3param.test.db.signed.jnl ns3/nsec3param.test.db ns3/nsec3param.test.db.signed ns3/dsset-nsec3param.test.

diff --git a/bin/tests/system/redirect/clean.sh b/bin/tests/system/redirect/clean.sh
index 161d110bdd3c1bf045484474b2f04b2170c8fc2e..c32cd1745a012f11199710cc5b2c74202455f232 100644 (file)
--- a/bin/tests/system/redirect/clean.sh
+++ b/bin/tests/system/redirect/clean.sh
@@ -16,6 +16,7 @@
 
 rm -f */named.memstats
 rm -f */named.run
+rm -f */named.stats
 rm -f dig.out.*
 rm -f ns*/named.lock
 rm -f ns1/K*

diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh
index 68f93cfe877fcb8851b6e3519e85e6371cb2ef16..ae2067ed39bf24f89c538f63bf3d4cce40c54804 100644 (file)
--- a/bin/tests/system/resolver/clean.sh
+++ b/bin/tests/system/resolver/clean.sh
@@ -18,6 +18,8 @@
 # Clean up after resolver tests.
 #
 rm -f */named.memstats
+rm -f */named.run
+rm -f */ans.run
 rm -f */*.jdb
 rm -f dig.out dig.out.*
 rm -f dig.*.out.*

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index be6a3ca0cea0d18a710c58291f562302ec58d48f..fbb2c6ddf92510be1224f58695132db70f4b0c7e 100644 (file)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -23,12 +23,14 @@ SYSTEMTESTTOP=.
 . $SYSTEMTESTTOP/conf.sh
 
 stopservers=true
+clean=true
 
 case $1 in
-   --keep) stopservers=false; shift ;;
+   --keep|-k) stopservers=false; shift ;;
+   --noclean|-n) clean=false; shift ;;
 esac
 
-test $# -gt 0 || { echo "usage: $0 [--keep] test-directory" >&2; exit 1; }
+test $# -gt 0 || { echo "usage: $0 [--keep|--noclean] test-directory" >&2; exit 1; }
 
 test=$1
 shift
@@ -113,11 +115,13 @@ if [ $status != 0 ]; then
 else
        echo "R:PASS"
 
-       # Clean up.
-        rm -f $SYSTEMTESTTOP/random.data
-       if test -f $test/clean.sh
+       if $clean
        then
-          ( cd $test && $SHELL clean.sh "$@" )
+               rm -f $SYSTEMTESTTOP/random.data
+               if test -f $test/clean.sh
+               then
+                  ( cd $test && $SHELL clean.sh "$@" )
+               fi
        fi
 fi
 

diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index 69ea993efa7197b2a9eff915e2a4d9b65f0468b2..7faa2f24e27ea56ad0760232d2564e992fbe171a 100644 (file)
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -27,7 +27,7 @@ status=0
 {
     for d in $SUBDIRS
     do
-            $SHELL run.sh $d || status=1
+            $SHELL run.sh "${@}" $d || status=1
     done
 } 2>&1 | tee "systests.output"
 

diff --git a/bin/tests/system/sfcache/clean.sh b/bin/tests/system/sfcache/clean.sh
index b3d6af83205835fcc15b5489d18f3648199b01e9..2acdc69ae239cf786f52f0670323cb338fad20c1 100644 (file)
--- a/bin/tests/system/sfcache/clean.sh
+++ b/bin/tests/system/sfcache/clean.sh
@@ -18,6 +18,7 @@ rm -f */K*.key */K*.private */*.signed */*.db */dsset-*
 rm -f */managed.conf */trusted.conf
 rm -f random.data
 rm -f */named.memstats
+rm -f */named.run
 rm -f dig.*
 rm -f sfcache.*
 rm -f ns*/named.lock

diff --git a/bin/tests/system/sortlist/clean.sh b/bin/tests/system/sortlist/clean.sh
index 03f7225c9b3bd25e5c239e14aed4da690e615429..6ef875ccaf2741c047ff7d4009949840fc2e7c39 100644 (file)
--- a/bin/tests/system/sortlist/clean.sh
+++ b/bin/tests/system/sortlist/clean.sh
@@ -19,4 +19,5 @@
 
 rm -f *.dig *.good *.out
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns*/named.lock

diff --git a/bin/tests/system/statistics/clean.sh b/bin/tests/system/statistics/clean.sh
index 70960f2cc472542c028bb22a64ea4c27a0bdac99..0ee2627319ead1b226a0d9955e4f430c85d4373e 100644 (file)
--- a/bin/tests/system/statistics/clean.sh
+++ b/bin/tests/system/statistics/clean.sh
@@ -24,6 +24,7 @@ rm -f ns3/example.bk
 rm -f ns3/internal.bk
 rm -f */named.memstats
 rm -f */named.run
+rm -f */ans.run
 rm -f */named.stats
 rm -f dig.out*
 rm -f curl.out.*

diff --git a/bin/tests/system/stub/clean.sh b/bin/tests/system/stub/clean.sh
index 69a8bd116359007ccb9aa3b874323a95bb2ce350..a0626c02aecdec0ab6336975dfd5ae65e049df0a 100644 (file)
--- a/bin/tests/system/stub/clean.sh
+++ b/bin/tests/system/stub/clean.sh
@@ -22,4 +22,5 @@
 #
 rm -f dig.out.ns3 ns3/child.example.st
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns*/named.lock

diff --git a/bin/tests/system/tkey/clean.sh b/bin/tests/system/tkey/clean.sh
index 20029d450baa7714e9164ce0145cfe0d5d2df24b..8609c985d4528372d59a5841b0b479a21db1765f 100644 (file)
--- a/bin/tests/system/tkey/clean.sh
+++ b/bin/tests/system/tkey/clean.sh
@@ -18,5 +18,6 @@
 rm -f dig.out.* rndc.out.* ns1/named.conf
 rm -f K* ns1/K*
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns1/_default.tsigkeys
 rm -f ns*/named.lock

diff --git a/bin/tests/system/tsiggss/clean.sh b/bin/tests/system/tsiggss/clean.sh
index 2787f6d200c51e7f35fc1019bc96e442f522241d..594c33f138917a13944bdc830485fd8c209a8a87 100644 (file)
--- a/bin/tests/system/tsiggss/clean.sh
+++ b/bin/tests/system/tsiggss/clean.sh
@@ -22,6 +22,7 @@ rm -f ns1/*.jnl ns1/update.txt ns1/auth.sock
 rm -f ns1/*.db ns1/K*.key ns1/K*.private
 rm -f ns1/_default.tsigkeys
 rm -f */named.memstats
+rm -f */named.run
 rm -f authsock.pid
 rm -f ns1/core
 rm -f nsupdate.out

diff --git a/bin/tests/system/unknown/clean.sh b/bin/tests/system/unknown/clean.sh
index c0b34b54c56f793e88353e3edbb33d0d82cb6664..64788819670a89c66b30c7eee3e43448eaf9aaa0 100644 (file)
--- a/bin/tests/system/unknown/clean.sh
+++ b/bin/tests/system/unknown/clean.sh
@@ -19,6 +19,7 @@
 
 rm -f dig.out check.out
 rm -f */named.memstats
+rm -f */named.run
 rm -f */*.bk
 rm -f */*.bk.*
 rm -f ns3/Kexample.*

diff --git a/bin/tests/system/upforwd/clean.sh b/bin/tests/system/upforwd/clean.sh
index c30569c0860b3c2cc446954a93aa08750ff93033..b13949b6f61528203e6fbf7af12da6e2c4be8c80 100644 (file)
--- a/bin/tests/system/upforwd/clean.sh
+++ b/bin/tests/system/upforwd/clean.sh
@@ -25,6 +25,8 @@ rm -f dig.out.ns1* dig.out.ns2 dig.out.ns1 dig.out.ns3 dig.out.ns1.after
 rm -f ns1/*.jnl ns2/*.jnl ns3/*.jnl ns1/example.db ns2/*.bk ns3/*.bk
 rm -f ns3/nomaster1.db
 rm -f */named.memstats
+rm -f */named.run
+rm -f */ans.run
 rm -f Ksig0.example2.*
 rm -f keyname
 rm -f ns*/named.lock

diff --git a/bin/tests/system/views/clean.sh b/bin/tests/system/views/clean.sh
index 03555206bf8eb27c7fa7a6cc79713039d134ef8f..ec41a928bc0e54b7ff23a28a1ffa83779bc969df 100644 (file)
--- a/bin/tests/system/views/clean.sh
+++ b/bin/tests/system/views/clean.sh
@@ -25,6 +25,7 @@ rm -f ns3/example.bk dig.out.ns?.?
 rm -f ns2/named.conf ns2/example.db ns3/named.conf ns3/internal.bk
 rm -f */*.jnl
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns2/external/K*
 rm -f ns2/external/inline.db.jbk
 rm -f ns2/external/inline.db.signed

diff --git a/bin/tests/system/xferquota/clean.sh b/bin/tests/system/xferquota/clean.sh
index b63eba3c8d0a9168a839ec1f65b349270c365fd7..d544051039eb99b03d7495e73b7ebaa4d8196cab 100644 (file)
--- a/bin/tests/system/xferquota/clean.sh
+++ b/bin/tests/system/xferquota/clean.sh
@@ -26,4 +26,5 @@ rm -f ns2/zone*.example.bk ns2/zones.conf
 rm -f dig.out.* ns2/changing.bk
 rm -f ns1/changing.db
 rm -f */named.memstats
+rm -f */named.run
 rm -f ns*/named.lock

diff --git a/bin/tests/system/zero/clean.sh b/bin/tests/system/zero/clean.sh
index 8d22346190d51cd891228a4af8f2eba3f53af023..ff51aa8b0bd7fccebc98206912d13958f82da4c1 100644 (file)
--- a/bin/tests/system/zero/clean.sh
+++ b/bin/tests/system/zero/clean.sh
@@ -13,6 +13,7 @@
 # PERFORMANCE OF THIS SOFTWARE.
 
 rm -f */named.run
+rm -f */named.memstats
 rm -f ns2/example.db
 rm -f ns4/example.bk
 rm -f dig.out*

diff --git a/bin/tests/system/zonechecks/clean.sh b/bin/tests/system/zonechecks/clean.sh
index b2734b057328956427f989e777932a6a8a689225..3d327d9e31873a2d34f6ce6fd1ed5dbd10656d86 100644 (file)
--- a/bin/tests/system/zonechecks/clean.sh
+++ b/bin/tests/system/zonechecks/clean.sh
@@ -16,6 +16,7 @@
 
 rm -f *.out
 rm -f */named.memstats
+rm -f */named.run
 rm -f */*.db */*.db.signed */K*.key */K*.private */*.jnl */dsset-*
 rm -f rndc.out.*
 rm -f ns*/named.lock