From: Stephen Morris <stephen@isc.org>
Date: Thu, 21 Dec 2017 18:14:34 +0000 (+0000)
Subject: [rt46602] Simplify the cleanup code
X-Git-Tag: v9.13.0~158^2~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0855a8a6cc8127c45cf7de04627ce34b7b189521;p=thirdparty%2Fbind9.git

[rt46602] Simplify the cleanup code
---

diff --git a/bin/tests/system/testsummary.sh b/bin/tests/system/testsummary.sh
index 0ed714ccd42..1c2a0c0251c 100644
--- a/bin/tests/system/testsummary.sh
+++ b/bin/tests/system/testsummary.sh
@@ -31,17 +31,10 @@ while getopts "n" flag; do
     esac
 done
 
-rm -f systests.output
-touch systests.output
-for directory in $SUBDIRS ; do
-    if [ -e $directory/test.output ]; then
-        cat $directory/test.output >> systests.output
-	if [ "$keepfile" = "" ]; then
-	    rm $directory/test.output
-	fi
-    fi
-done
-
+cat */test.output > systests.output 2> /dev/null
+if [ "$keepfile" = "" ]; then
+    rm -f */test.output
+fi
 
 $PERL testsock.pl || {
     cat <<EOF