integrate Anthonys rred with POC for client-side merge

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

diff --git a/test/integration/run-tests b/test/integration/run-tests
index 2929868221be36833f295edcb958aab88fb472a4..7316016e2c3dac61eb0f4c56f951157c9521f94f 100755 (executable)
--- a/test/integration/run-tests
+++ b/test/integration/run-tests
@@ -2,6 +2,7 @@
 set -e
 
 FAIL=0
+FAILED_TESTS=""
 DIR=$(readlink -f $(dirname $0))
 if [ "$1" = "-q" ]; then
        export MSGLEVEL=2
@@ -17,6 +18,10 @@ 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 [ "$MSGLEVEL" -le 2 ]; then
                echo -n "${CTEST}Testcase ${CHIGH}$(basename ${testcase})${CRESET}: "
@@ -25,6 +30,7 @@ for testcase in $(run-parts --list $DIR | grep '/test-'); do
        fi
        if ! ${testcase}; then
                  FAIL=$((FAIL+1))
+                 FAILED_TESTS="$FAILED_TESTS $(basename $testcase)"
                  echo "$(basename $testcase) ... FAIL"
         fi
        if [ "$MSGLEVEL" -le 2 ]; then
@@ -33,4 +39,8 @@ for testcase in $(run-parts --list $DIR | grep '/test-'); do
 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))