Clean omitted files from system tests

Any CI job:
- I:dnssec:file dnssec/ns1/trusted.keys not removed
- I:rpzrecurse:file rpzrecurse/ns3/named.run.prev not removed

system:gcc:sid:amd64:
- I:mirror:file mirror/ns3/_default.nzf not removed

system:gcc:xenial:amd64:
- I:shutdown:file shutdown/.cache/v/cache/lastfailed not removed

(cherry picked from commit 14a104d1211611aa0d5465bd339a7d4c711acf33)

diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index d76c05667c59d3c5f746703ef6cd9633ee03ba8a..e660c3349d51a33cf239cb51545dc87bfc68a5da 100644 (file)
--- a/bin/tests/system/dnssec/clean.sh
+++ b/bin/tests/system/dnssec/clean.sh
@@ -35,6 +35,7 @@ rm -f ./ns*/managed-keys.bind* ./ns*/*.mkeys*
 rm -f ./ns*/named.lock
 rm -f ./ns1/managed.key.id
 rm -f ./ns1/root.db ./ns2/example.db ./ns2/managed.db ./ns2/trusted.db
+rm -f ./ns1/trusted.keys
 rm -f ./ns2/algroll.db
 rm -f ./ns2/badparam.db ./ns2/badparam.db.bad
 rm -f ./ns2/cdnskey-kskonly.secure.db

diff --git a/bin/tests/system/mirror/clean.sh b/bin/tests/system/mirror/clean.sh
index b08171796819d372483e1d60d1a76ce4ca3f69d8..d079f44d75bdf87b2e09df65e49e1537302a6067 100644 (file)
--- a/bin/tests/system/mirror/clean.sh
+++ b/bin/tests/system/mirror/clean.sh
@@ -18,6 +18,7 @@ rm -f */K*
 rm -f */db-*
 rm -f */dsset-*
 rm -f */jn-*
+rm -f */_default.nzf
 rm -f */managed-keys.bind*
 rm -f */named.memstats
 rm -f */named.run

diff --git a/bin/tests/system/rpzrecurse/clean.sh b/bin/tests/system/rpzrecurse/clean.sh
index d8774c9d2a4873398ddd6adf974ffa3976b2499d..3215e3fa3d5f43ff2eae3b02c3dc1601684f1833 100644 (file)
--- a/bin/tests/system/rpzrecurse/clean.sh
+++ b/bin/tests/system/rpzrecurse/clean.sh
@@ -23,6 +23,7 @@ rm -f ns2/named.[0-9]*.conf
 rm -f ns2/named.conf.header
 
 rm -f ns3/named2.conf
+rm -f ns3/named.run.prev
 
 rm -f dnsrps*.conf dnsrpzd*
 rm -f ns*/session.key

diff --git a/bin/tests/system/shutdown/clean.sh b/bin/tests/system/shutdown/clean.sh
index 8c82e0ed6b90da0f4765e5f032cfa843f16c6a4f..c161c2a33a16c7ae6b4a87a763fcc1fa89843afe 100644 (file)
--- a/bin/tests/system/shutdown/clean.sh
+++ b/bin/tests/system/shutdown/clean.sh
@@ -15,3 +15,4 @@ rm -f */named.conf
 rm -f */named.run
 rm -rf __pycache__
 rm -f *.status
+rm -rf .cache