From b7064bad16628a082454356a4150dd2747b2e206 Mon Sep 17 00:00:00 2001 From: Jeff Bilyk Date: Tue, 14 Dec 2010 04:34:16 +0000 Subject: apts: enhance status display messages enhance status display messages --- apts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apts b/apts index 6a612dc..055f39c 100755 --- a/apts +++ b/apts @@ -40,8 +40,8 @@ shift # if there aren't any args besides outfile test all packages if [ $# -eq 0 ]; - then totaltests=`ls ./tests/ | wc -w` && echo "All (${totaltests}) packages to be tested" && passedtests="0" && for package in `ls ./tests/`; - do echo "Testing $package apk" && /bin/sh -e ./tests/$package $package >> "$OUTFILE" 2>&1 && echo "$package passed tests" >> "$OUTFILE" && echo "$package passed tests" && passedtests=$((passedtests + 1)); + then i=1 && totaltests=`ls ./tests/ | wc -w` && echo "All (${totaltests}) packages to be tested" && passedtests="0" && for package in `ls ./tests/`; + do echo "Testing $package apk (${i}/${totaltests})" && i=$((i + 1))&& /bin/sh -e ./tests/$package $package >> "$OUTFILE" 2>&1 && echo "$package passed tests" >> "$OUTFILE" && echo "$package passed tests" && passedtests=$((passedtests + 1)); done && echo "$passedtests of $totaltests passed" && exit 0; fi @@ -54,7 +54,7 @@ while [ $# -gt 0 ]; do test -e ./tests/$PACKAGE # If no testing file exists then run generic-apk if [ "$?" == "1" ]; - then echo "Testing file for $PACKAGE does not exist" && /bin/sh -e ./tests/generic-apk $PACKAGE >> "$OUTFILE" 2>&1 && echo "$PACKAGE passed tests" && exit 0; + then echo "Testing file for $PACKAGE does not exist" && /bin/sh -e ./tests/generic-apk $PACKAGE >> "$OUTFILE" 2>&1 && echo "$PACKAGE passed tests"; # if testing file exists, then keep running else echo "Testing $PACKAGE apk" && /bin/sh -e ./tests/$PACKAGE $PACKAGE >> "$OUTFILE" 2>&1 && echo "$PACKAGE passed tests"; fi -- cgit v1.2.3