merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

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

diff --git a/test/libapt/run-tests b/test/libapt/run-tests
index 4ea9a916da944e2d1fec4eddff14a01bb9653f5d..f18be6d2b1688e48f59a4aba8769a38d4e48e938 100755 (executable)
--- a/test/libapt/run-tests
+++ b/test/libapt/run-tests
@@ -7,6 +7,7 @@ echo "Compiling the tests …"
 echo "Running all testcases …"
 LDPATH="$DIR/../../build/bin"
 EXT="_libapt_test"
 echo "Running all testcases …"
 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
 
 # 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,7 +66,8 @@ 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-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} "
        elif [ $name = "HashSums${EXT}" ]; then
                TMP="$(readlink -f "./${0}")"
                echo -n "Testing with ${NAME} "


@@ -105,9 +107,15 @@ do
        fi
 
        echo -n "Testing with ${NAME} "
        fi
 
        echo -n "Testing with ${NAME} "

-       LD_LIBRARY_PATH=${LDPATH} ${testapp} ${tmppath} && echo "$TESTOKAY" || echo "$TESTFAIL"
+       if 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
 
        if [ -n "$tmppath" -a -d "$tmppath" ]; then
                rm -rf "$tmppath"
        fi
 done

+exit $EXIT_CODE