merged from bzr+ssh://bazaar.launchpad.net/~donkult/apt/sid/

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

diff --git a/test/libapt/run-tests b/test/libapt/run-tests
index bd47d4e0d8dd50a4825b757e11dfbd43fb4b21ec..4ea9a916da944e2d1fec4eddff14a01bb9653f5d 100755 (executable)
--- a/test/libapt/run-tests
+++ b/test/libapt/run-tests
@@ -67,11 +67,9 @@ do
                        "${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"
        elif [ $name = "HashSums${EXT}" ]; then
-               TMP="$(mktemp)"
-               dmesg > $TMP
-               echo -n "Testing with \033[1;35m${name}\033[0m ... "
-               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 "\033[1;32mOKAY\033[0m" || echo "\033[1;31mFAILED\033[0m"
-               rm $TMP
+               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
        elif [ $name = "CompareVersion${EXT}" ]; then
                tmppath="${DIR}/versions.lst"
@@ -88,16 +86,16 @@ do
                        "${tmppath}/dists/broken/non-free/source"
                touch "${tmppath}/dists/broken/.aptignr" \
                        "${tmppath}/dists/stable/main/binary-i386/Packages" \
-                       "${tmppath}/dists/stable/main/binary-i386/Packages.gz" \
-                       "${tmppath}/dists/stable/main/source/Sources.gz" \
+                       "${tmppath}/dists/stable/main/binary-i386/Packages.bz2" \
+                       "${tmppath}/dists/stable/main/source/Sources.xz" \
                        "${tmppath}/dists/stable/contrib/binary-amd64/Packages" \
                        "${tmppath}/dists/stable/contrib/binary-amd64/Packages.gz" \
                        "${tmppath}/dists/stable/contrib/binary-all/Packages" \
-                       "${tmppath}/dists/unstable/main/binary-i386/Packages.gz" \
-                       "${tmppath}/dists/unstable/main/binary-i386/Packages.gz" \
+                       "${tmppath}/dists/unstable/main/binary-i386/Packages.xz" \
+                       "${tmppath}/dists/unstable/main/binary-i386/Packages.lzma" \
                        "${tmppath}/dists/unstable/main/i18n/Translation-en" \
-                       "${tmppath}/dists/unstable/main/i18n/Translation-de.gz" \
-                       "${tmppath}/dists/unstable/main/source/Sources.gz" \
+                       "${tmppath}/dists/unstable/main/i18n/Translation-de.bz2" \
+                       "${tmppath}/dists/unstable/main/source/Sources.xz" \
                        "${tmppath}/dists/broken/non-free/source/Sources.gz" \
                        "${tmppath}/dists/stable/Release.gpg" \
                        "${tmppath}/dists/stable/Release" \