Merge branch 'feature/edit-sources' into debian/sid

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

diff --git a/test/libapt/run-tests b/test/libapt/run-tests
index 4ea9a916da944e2d1fec4eddff14a01bb9653f5d..a056f31f98d1bc4a83344f80bdfc4abb4df77306 100755 (executable)
--- a/test/libapt/run-tests
+++ b/test/libapt/run-tests
@@ -2,11 +2,14 @@
 set -e
 
 DIR=$(readlink -f $(dirname $0))
-echo "Compiling the tests …"
-(cd $DIR && make)
-echo "Running all testcases …"
+if [ -z "$MAKELEVEL" ]; then
+       echo 'Compiling the tests …'
+       (cd $DIR && make)
+       echo 'Running all testcases …'
+fi
 LDPATH="$DIR/../../build/bin"
 EXT="_libapt_test"
+EXIT_CODE=0
 
 # detect if output is on a terminal (colorful) or better not
 if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null; then
@@ -65,12 +68,15 @@ do
                        "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-pt" \
                        "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-se~" \
                        "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-st.bak" \
-                       "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-ast_DE"
+                       "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-ast_DE" \
+                       "${tmppath}/ftp.de.debian.org_debian_dists_sid_main_i18n_Translation-tlh%5fDE"
        elif [ $name = "HashSums${EXT}" ]; then
                TMP="$(readlink -f "./${0}")"
-               echo -n "Testing with ${NAME} "
-               LD_LIBRARY_PATH=${LDPATH} ${testapp} $TMP $(md5sum $TMP | cut -d' ' -f 1) $(sha1sum $TMP | cut -d' ' -f 1) $(sha256sum $TMP | cut -d' ' -f 1) $(sha512sum $TMP | cut -d' ' -f 1) && echo "$TESTOKAY" || echo "$TESTFAIL"
-               continue
+               tmppath="$TMP"
+               tmppath="${tmppath} $(md5sum $TMP | cut -d' ' -f 1)"
+               tmppath="${tmppath} $(sha1sum $TMP | cut -d' ' -f 1)"
+               tmppath="${tmppath} $(sha256sum $TMP | cut -d' ' -f 1)"
+               tmppath="${tmppath} $(sha512sum $TMP | cut -d' ' -f 1)"
        elif [ $name = "CompareVersion${EXT}" ]; then
                tmppath="${DIR}/versions.lst"
        elif [ $name = "CdromFindPackages${EXT}" ]; then
@@ -105,9 +111,15 @@ do
        fi
 
        echo -n "Testing with ${NAME} "
-       LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "$TESTOKAY" || echo "$TESTFAIL"
+       if MALLOC_PERTURB_=21 MALLOC_CHECK_=2 LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} ; then
+               echo "$TESTOKAY"
+       else
+               echo "$TESTFAIL"
+               EXIT_CODE=1
+       fi
 
        if [ -n "$tmppath" -a -d "$tmppath" ]; then
                rm -rf "$tmppath"
        fi
 done
+exit $EXIT_CODE