From 5d69915cd894e87ffa4e12258b0be8955893c7c2 Mon Sep 17 00:00:00 2001 From: Stephen Morris Date: Thu, 21 Dec 2017 18:14:34 +0000 Subject: [PATCH] [rt46602] Simplify the cleanup code (cherry picked from commit 0855a8a6cc8127c45cf7de04627ce34b7b189521) (cherry picked from commit fb5974f9026ab0d5c371ccdb871d9b50474202bc) --- bin/tests/system/testsummary.sh | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) 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 <