From: Michal Nowak <mnowak@isc.org>
Date: Mon, 15 Feb 2021 11:48:54 +0000 (+0100)
Subject: Clean omitted files from system tests
X-Git-Tag: v9.17.11~44^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=14a104d1211611aa0d5465bd339a7d4c711acf33;p=thirdparty%2Fbind9.git

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:clang:freebsd11:amd64:
- I:tkey:file tkey/ns1/named.conf-e not removed

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

system:gcc:xenial:amd64:
- I:rpzextra:file rpzextra/.cache/v/cache/lastfailed not removed
- I:rpzrecurse:file rpzrecurse/ns3/named.run.prev not removed
- I:shutdown:file shutdown/.cache/v/cache/lastfailed not removed
---

diff --git a/bin/tests/system/dnssec/clean.sh b/bin/tests/system/dnssec/clean.sh
index d76c05667c5..e660c3349d5 100644
--- 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 b0817179681..d079f44d75b 100644
--- 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/rpzextra/clean.sh b/bin/tests/system/rpzextra/clean.sh
index dbf193e5eb1..21d058a803f 100644
--- a/bin/tests/system/rpzextra/clean.sh
+++ b/bin/tests/system/rpzextra/clean.sh
@@ -15,3 +15,4 @@ rm -f ns*/named.run
 rm -f ns*/rpz*.txt
 rm -rf __pycache__
 rm -f *.status
+rm -rf .cache
diff --git a/bin/tests/system/rpzrecurse/clean.sh b/bin/tests/system/rpzrecurse/clean.sh
index f41c603df2d..ed0ece10570 100644
--- 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/named.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 8c82e0ed6b9..c161c2a33a1 100644
--- 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
diff --git a/bin/tests/system/tkey/clean.sh b/bin/tests/system/tkey/clean.sh
index 05e5acdcf13..46f3704aa01 100644
--- a/bin/tests/system/tkey/clean.sh
+++ b/bin/tests/system/tkey/clean.sh
@@ -18,6 +18,7 @@ rm -f ns*/K*
 rm -f ns*/_default.tsigkeys
 rm -f ns*/managed-keys.bind*
 rm -f ns*/named.conf
+rm -f ns*/named.conf-e
 rm -f ns*/named.lock
 rm -f ns*/named.memstats
 rm -f ns*/named.run