Merge remote-tracking branch 'mvo/debian/sid' into debian/sid

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

diff --git a/test/integration/run-tests b/test/integration/run-tests
index c7ea0a61ac3567fa05c5d6b7ed18c0abcd5cc7d9..7316016e2c3dac61eb0f4c56f951157c9521f94f 100755 (executable)
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -1,8 +1,46 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

+FAIL=0
+FAILED_TESTS=""

 DIR=$(readlink -f $(dirname $0))
 DIR=$(readlink -f $(dirname $0))

+if [ "$1" = "-q" ]; then
+       export MSGLEVEL=2
+elif [ "$1" = "-v" ]; then
+       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
 for testcase in $(run-parts --list $DIR | grep '/test-'); do

-       echo "\033[1;32mRun Testcase \033[1;35m$(basename ${testcase})\033[0m"
-       ${testcase}
+       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 "$(basename $testcase) ... FAIL"
+        fi
+       if [ "$MSGLEVEL" -le 2 ]; then
+               echo
+       fi

 done
 done

+
+echo "failures: $FAIL"
+if [ -n "$FAILED_TESTS" ]; then 
+    echo "Failed tests: $FAILED_TESTS";
+fi
+# ensure we don't overflow
+exit $((FAIL <= 255 ? FAIL : 255))