merged from donkult

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

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

+FAIL=0

 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

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

 done
 done

+
+echo "failures: $FAIL"
+exit $FAIL