merged from david

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index fa4a98f58670fc90ec6471bbd4b19b5b9bc3755c..5a0e1070f82c3bc6067cf835c6b8886e97d9c28e 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -107,6 +107,10 @@ aptitude() {
                LD_LIBRARY_PATH=${BUILDDIRECTORY}  $(which aptitude) $*
        fi
 }
                LD_LIBRARY_PATH=${BUILDDIRECTORY}  $(which aptitude) $*
        fi
 }

+gdb() {
+       echo "gdb: run »$*«"
+       APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which gdb) ${BUILDDIRECTORY}/$1
+}

 
 addtrap() {
        CURRENTTRAP="$CURRENTTRAP $1"
 
 addtrap() {
        CURRENTTRAP="$CURRENTTRAP $1"


@@ -151,7 +155,7 @@ setupenvironment() {
        echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf
        echo "DPKG::options:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf

-       if ! $(which dpkg) --assert-multi-arch; then
+       if ! $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then

                echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…
        fi
        echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
                echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…
        fi
        echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf


@@ -199,7 +203,7 @@ configdpkg() {
                        echo -n > rootdir/var/lib/dpkg/status
                fi
        fi
                        echo -n > rootdir/var/lib/dpkg/status
                fi
        fi

-       if $(which dpkg) --assert-multi-arch; then
+       if $(which dpkg) --assert-multi-arch 2>&1 > /dev/null; then

                local ARCHS="$(getarchitectures)"
                if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then
                        DPKGARCH="$(dpkg --print-architecture)"
                local ARCHS="$(getarchitectures)"
                if echo "$ARCHS" | grep -E -q '[^ ]+ [^ ]+'; then
                        DPKGARCH="$(dpkg --print-architecture)"


@@ -558,7 +562,7 @@ buildaptarchivefromfiles() {
                msgninfo "\t${line} file… "
                cat ${line} | gzip > ${line}.gz
                cat ${line} | bzip2 > ${line}.bz2
                msgninfo "\t${line} file… "
                cat ${line} | gzip > ${line}.gz
                cat ${line} | bzip2 > ${line}.bz2

-               cat ${line} | lzma > ${line}.lzma
+               cat ${line} | xz --format=lzma > ${line}.lzma

                cat ${line} | xz > ${line}.xz
                msgdone "info"
        done
                cat ${line} | xz > ${line}.xz
                msgdone "info"
        done