Fix the test suite again

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

diff --git a/test/integration/run-tests b/test/integration/run-tests
index 2929868221be36833f295edcb958aab88fb472a4..6c6a376116f88f9838727183f29e13ed332dcf57 100755 (executable)
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -2,35 +2,69 @@
 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=4
-fi
+while [ -n "$1" ]; do
+       if [ "$1" = "-q" ]; then
+               export MSGLEVEL=2
+       elif [ "$1" = "-v" ]; then
+               export MSGLEVEL=4
+       elif [ "$1" = '--color=no' ]; then
+               export MSGCOLOR='NO'
+       else
+               echo >&2 "WARNING: Unknown parameter »$1« will be ignored"
+       fi
+       shift
+done
+export MSGLEVEL="${MSGLEVEL:-3}"
 
-if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
+if [ "$MSGCOLOR" != 'NO' ]; then
+       if [ ! -t 1 ]; then # but check that we output to a terminal
+               export MSGCOLOR='NO'
+       fi
+fi
+if [ "$MSGCOLOR" != 'NO' ]; then
        CTEST='\033[1;32m'
        CHIGH='\033[1;35m'
        CRESET='\033[0m'
-elif [ -z "${MSGLEVEL}" ]; then
-       export MSGLEVEL=2
+else
+       CTEST=''
+       CHIGH=''
+       CRESET=''
 fi
 
+TOTAL="$(run-parts --list $DIR | grep '/test-' | wc -l)"
 for testcase in $(run-parts --list $DIR | grep '/test-'); do
        if [ "$MSGLEVEL" -le 2 ]; then
-               echo -n "${CTEST}Testcase ${CHIGH}$(basename ${testcase})${CRESET}: "
+               printf "($(($ALL+1))/${TOTAL}) ${CTEST}Testcase ${CHIGH}$(basename ${testcase})${CRESET}: "
        else
-               echo "${CTEST}Run Testcase ${CHIGH}$(basename ${testcase})${CRESET}"
+               printf "${CTEST}Run Testcase ($(($ALL+1))/${TOTAL}) ${CHIGH}$(basename ${testcase})${CRESET}\n"
        fi
        if ! ${testcase}; then
-                 FAIL=$((FAIL+1))
-                 echo "$(basename $testcase) ... FAIL"
-        fi
+               FAIL=$((FAIL+1))
+               FAILED_TESTS="$FAILED_TESTS $(basename $testcase)"
+               if [ "$MSGLEVEL" -le 2 ]; then
+                       printf >&2 "\n${CHIGH}Running $(basename $testcase) -> FAILED${CRESET}"
+               else
+                       echo >&2 "${CHIGH}Running $(basename $testcase) -> FAILED${CRESET}"
+               fi
+       else
+               PASS=$((PASS+1))
+       fi
+       ALL=$((ALL+1))
        if [ "$MSGLEVEL" -le 2 ]; then
                echo
        fi
 done
 
-echo "failures: $FAIL"
-exit $FAIL
+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))