From fec9cc90e697161f12d54d76527701e1605bc79d Mon Sep 17 00:00:00 2001
From: Michael Sawyer <source@isc.org>
Date: Thu, 6 Jul 2000 19:54:02 +0000
Subject: [PATCH] Corrected cleanup

---
 bin/tests/system/Makefile.in |  5 +----
 bin/tests/system/cleanall.sh | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/bin/tests/system/Makefile.in b/bin/tests/system/Makefile.in
index 094654f8a6..a89c98f1e1 100644
--- a/bin/tests/system/Makefile.in
+++ b/bin/tests/system/Makefile.in
@@ -13,7 +13,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: Makefile.in,v 1.15 2000/07/06 19:40:57 mws Exp $
+# $Id: Makefile.in,v 1.16 2000/07/06 19:54:01 mws Exp $
 
 @BIND9_INCLUDES@
 SUBDIRS =	lwresd
@@ -24,9 +24,6 @@ TARGETS =
 test: 
 	sh ./runall.sh
 
-distclean::
-	sh ./cleanall.sh
-
 clean distclean::
 	sh ./cleanall.sh
 
diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh
index 99616c47c5..f2616368ef 100644
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@@ -15,7 +15,7 @@
 # ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 # SOFTWARE.
 
-# $Id: cleanall.sh,v 1.1 2000/06/23 21:28:17 mws Exp $
+# $Id: cleanall.sh,v 1.2 2000/07/06 19:54:02 mws Exp $
 
 #
 # Clean up after system tests.
@@ -24,5 +24,15 @@
 SYSTEMTESTTOP=.
 . $SYSTEMTESTTOP/conf.sh
 
-find . -type f -name '*.run' -print | xargs rm -f
 
+find . -type f \( \
+    -name 'K*' -o -name '*~' -o -name '*.core' -o -name '*.log' \
+    -o -name '*.pid' -o -name '*.keyset' \
+\) -print | xargs rm -f
+
+status=0
+
+for d in $SUBDIRS
+do
+   test ! -f $d/clean.sh || ( cd $d && sh clean.sh )
+done