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 edac07dbfd0cd289bd441fb92ab1c7d0b58d0914..7316016e2c3dac61eb0f4c56f951157c9521f94f 100755 (executable)
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -2,26 +2,45 @@
 set -e
 
 FAIL=0
 set -e
 
 FAIL=0

+FAILED_TESTS=""

 DIR=$(readlink -f $(dirname $0))
 if [ "$1" = "-q" ]; then
        export MSGLEVEL=2
 elif [ "$1" = "-v" ]; then
        export MSGLEVEL=4
 fi
 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

-       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
        else

-               echo "\033[1;32mRun Testcase \033[1;35m$(basename ${testcase})\033[0m"
+               echo "${CTEST}Run Testcase ${CHIGH}$(basename ${testcase})${CRESET}"

        fi
        if ! ${testcase}; then
                  FAIL=$((FAIL+1))
        fi
        if ! ${testcase}; then
                  FAIL=$((FAIL+1))

+                 FAILED_TESTS="$FAILED_TESTS $(basename $testcase)"

                  echo "$(basename $testcase) ... FAIL"
         fi
                  echo "$(basename $testcase) ... FAIL"
         fi

-       if [ "$1" = "-q" ]; then
+       if [ "$MSGLEVEL" -le 2 ]; then

                echo
        fi
 done
 
 echo "failures: $FAIL"
                echo
        fi
 done
 
 echo "failures: $FAIL"

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