Fix "make check" failure (Issue #5033)

1 files changed, 13 insertions, 19 deletions

diff --git a/test/run-stp-tests.sh b/test/run-stp-tests.sh
index 54ed7fbf4..792f10d70 100755
--- a/test/run-stp-tests.sh
+++ b/test/run-stp-tests.sh
@@ -1105,29 +1105,23 @@ done
 cat str-trailer.html >>$strfile
 
 echo ""
+for file in $BASE/log/*_log; do
+        baselog=`basename $file`
+        cp $file $baselog-$date-$user
+        echo "Copied log file \"$baselog-$date-$user\" to test directory."
+done
+cp $strfile .
+echo "Copied report file \"cups-str-$date-$user.html\" to test directory."
 
-if test $fail != 0; then
-	echo "$fail tests failed."
-
-        for file in $BASE/log/*_log; do
-                baselog=`basename $file`
-                cp $file $baselog-$date-$user
-                echo "Copied log file \"$baselog-$date-$user\" to test directory."
-        done
-	cp $strfile .
-        echo "Copied report file \"cups-str-$date-$user.html\" to test directory."
+# Clean out old failure log files after 1 week...
+find . -name \*_log-\*-$user -a -mtime +1w -print -exec rm -f '{}' \; | awk '{print "Removed old log file \"" substr($1,3) "\" from test directory."}'
+find . -name cups-str-\*-$user.html -a -mtime +1w -print -exec rm -f '{}' \; | awk '{print "Removed old report file \"" $1 "\" from test directory."}'
 
-        # Clean out old failure log files after 1 week...
-        find . -name \*_log-\*-$user -a -mtime +1w -print -exec rm -f '{}' \; | awk '{print "Removed old log file \"" substr($1,3) "\" from test directory."}'
-        find . -name cups-str-\*-$user.html -a -mtime +1w -print -exec rm -f '{}' \; | awk '{print "Removed old report file \"" $1 "\" from test directory."}'
+echo ""
 
-        echo ""
+if test $fail != 0; then
+	echo "$fail tests failed."
 	exit 1
-
 else
 	echo "All tests were successful."
-	echo ""
-        echo "Log files can be found in $BASE/log."
-        echo "A HTML report was created in $strfile."
-        echo ""
 fi