[rt46602] Simplify the cleanup code

(cherry picked from commit 0855a8a6cc8127c45cf7de04627ce34b7b189521)
(cherry picked from commit fb5974f9026ab0d5c371ccdb871d9b50474202bc)
(cherry picked from commit 5d69915cd894e87ffa4e12258b0be8955893c7c2)

diff --git a/bin/tests/system/testsummary.sh b/bin/tests/system/testsummary.sh
index 0ed714ccd4276ef60eec37175befe54200fb7413..1c2a0c0251cb04c04976318947c4b11c201f4aa3 100644 (file)
--- 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