From ae6b7bcd92470ef7361fdf7131909c76f92b45a4 Mon Sep 17 00:00:00 2001
From: "Jeremy C. Reed" <jreed@isc.org>
Date: Tue, 21 Apr 2015 08:42:09 -0400
Subject: [PATCH] add some more files to cleanup after successful system test
 runs

---
 bin/tests/system/addzone/clean.sh       | 1 +
 bin/tests/system/dlzexternal/clean.sh   | 1 +
 bin/tests/system/inline/clean.sh        | 1 +
 bin/tests/system/logfileconfig/clean.sh | 1 +
 bin/tests/system/nsupdate/clean.sh      | 2 +-
 bin/tests/system/rndc/clean.sh          | 1 +
 bin/tests/system/upforwd/clean.sh       | 3 ++-
 7 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/bin/tests/system/addzone/clean.sh b/bin/tests/system/addzone/clean.sh
index fea8d23bf5..c53eaa2fac 100644
--- a/bin/tests/system/addzone/clean.sh
+++ b/bin/tests/system/addzone/clean.sh
@@ -26,3 +26,4 @@ rm -f ns2/inline.db.jbk
 rm -f ns2/inline.db.signed
 rm -f ns2/inlineslave.bk*
 rm -f ns*/named.lock
+rm -f ns2/nzf-*
diff --git a/bin/tests/system/dlzexternal/clean.sh b/bin/tests/system/dlzexternal/clean.sh
index f9d5c6ce40..fe93ab6e80 100644
--- a/bin/tests/system/dlzexternal/clean.sh
+++ b/bin/tests/system/dlzexternal/clean.sh
@@ -23,3 +23,4 @@ rm -f */named.memstats
 rm -f ns1/ddns.key
 rm -f dig.out*
 rm -f ns*/named.lock
+rm -f ns1/session.key
diff --git a/bin/tests/system/inline/clean.sh b/bin/tests/system/inline/clean.sh
index a1a4ac71d8..5dd92ce103 100644
--- a/bin/tests/system/inline/clean.sh
+++ b/bin/tests/system/inline/clean.sh
@@ -90,3 +90,4 @@ rm -f checkgost checkdsa checkecdsa
 rm -f ns3/a-file
 rm -f ns*/named.lock
 rm -f dig.out.*
+rm -f ns3/nzf-*
diff --git a/bin/tests/system/logfileconfig/clean.sh b/bin/tests/system/logfileconfig/clean.sh
index c147ed5150..b5b4cabad2 100644
--- a/bin/tests/system/logfileconfig/clean.sh
+++ b/bin/tests/system/logfileconfig/clean.sh
@@ -26,3 +26,4 @@ rm -f ns1/named.conf
 rm -rf ns1/named_dir
 rm -f ns1/named_deflog
 rm -f ns*/named.lock
+rm -f ns1/query_log
diff --git a/bin/tests/system/nsupdate/clean.sh b/bin/tests/system/nsupdate/clean.sh
index 67df86538d..92ea1036e4 100644
--- a/bin/tests/system/nsupdate/clean.sh
+++ b/bin/tests/system/nsupdate/clean.sh
@@ -27,7 +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 nsupdate.out
+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.
 rm -f ns3/dnskey.test.db.signed.jnl ns3/dnskey.test.db ns3/dnskey.test.db.signed ns3/dsset-dnskey.test.
diff --git a/bin/tests/system/rndc/clean.sh b/bin/tests/system/rndc/clean.sh
index 5c0e8de5fc..f7b37ee90a 100644
--- a/bin/tests/system/rndc/clean.sh
+++ b/bin/tests/system/rndc/clean.sh
@@ -24,3 +24,4 @@ rm -f ns4/*.conf
 rm -f rndc.status
 rm -f rndc.output
 rm -f ns*/named.lock
+rm -f ns4/_default.nta
diff --git a/bin/tests/system/upforwd/clean.sh b/bin/tests/system/upforwd/clean.sh
index 135668c33f..47edaf5081 100644
--- a/bin/tests/system/upforwd/clean.sh
+++ b/bin/tests/system/upforwd/clean.sh
@@ -21,10 +21,11 @@
 # Clean up after zone transfer tests.
 #
 
-rm -f dig.out.ns1 dig.out.ns2 dig.out.ns1 dig.out.ns3 dig.out.ns1.after
+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 Ksig0.example2.*
 rm -f keyname
 rm -f ns*/named.lock
+rm -f ns1/example2.db