correct some quoting offenses

[apt.git] / test / integration / run-tests

diff --git a/test/integration/run-tests b/test/integration/run-tests
index 5644f0a05ddfeb8198111341a7c5a31d85e89818..881c1c56b1efeebd8aec36384d847fdd2cdbbd63 100755 (executable)
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -1,20 +1,54 @@
 #!/bin/sh
 set -e
 
+FAIL=0
+PASS=0
+ALL=0
+
+FAILED_TESTS=""
 DIR=$(readlink -f $(dirname $0))
 if [ "$1" = "-q" ]; then
        export MSGLEVEL=2
 elif [ "$1" = "-v" ]; then
-       export MSGLEVEL=5
+       export MSGLEVEL=4
+fi
+
+if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
+       CTEST='\033[1;32m'
+       CHIGH='\033[1;35m'
+       CRESET='\033[0m'
+elif [ -z "${MSGLEVEL}" ]; then
+       export MSGLEVEL=2
+fi
+
+if [ -z "$MSGLEVEL" ]; then
+       MSGLEVEL=5
 fi
+
 for testcase in $(run-parts --list $DIR | grep '/test-'); do
-       if [ "$1" = "-q" ]; then
-               echo -n "\033[1;32mRun Testcase \033[1;35m$(basename ${testcase})\033[0m"
+       if [ "$MSGLEVEL" -le 2 ]; then
+               echo -n "${CTEST}Testcase ${CHIGH}$(basename ${testcase})${CRESET}: "
+       else
+               echo "${CTEST}Run Testcase ${CHIGH}$(basename ${testcase})${CRESET}"
+       fi
+       if ! ${testcase}; then
+               FAIL=$((FAIL+1))
+               FAILED_TESTS="$FAILED_TESTS $(basename $testcase)"
+               echo >&2 "$(basename $testcase) ... FAIL"
        else
-               echo "\033[1;32mRun Testcase \033[1;35m$(basename ${testcase})\033[0m"
+               PASS=$((PASS+1))
        fi
-       ${testcase}
-       if [ "$1" = "-q" ]; then
+       ALL=$((ALL+1))
+       if [ "$MSGLEVEL" -le 2 ]; then
                echo
        fi
 done
+
+echo >&2 "Statistics: $ALL tests were run: $PASS successfully and $FAIL failed"
+if [ -n "$FAILED_TESTS" ]; then
+       echo >&2 "Failed tests: $FAILED_TESTS"
+else
+       echo >&2 'All tests seem to have been run successfully. What could possibly go wrong?'
+fi
+# ensure we don't overflow
+exit $((FAIL <= 255 ? FAIL : 255))