merge with debian-sid to get final 0.8.4

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 2b26fc8f7e84600fac679a44f95d98ca2986ca06..59d2f0e85e548ad8762514168fe3b13f3af395ae 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -72,6 +72,7 @@ aptconfig() { runapt apt-config $*; }
 aptcache() { runapt apt-cache $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
+aptkey() { runapt apt-key $*; }
 dpkg() {
        $(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
 }
@@ -79,7 +80,7 @@ dpkg() {
 setupenvironment() {
        TMPWORKINGDIRECTORY=$(mktemp -d)
        local TESTDIR=$(readlink -f $(dirname $0))
-       msgninfo "Preparing environment for ${CCMD}$0${CINFO} in ${TMPWORKINGDIRECTORY}… "
+       msgninfo "Preparing environment for ${CCMD}$(basename $0)${CINFO} in ${TMPWORKINGDIRECTORY}… "
        BUILDDIRECTORY="${TESTDIR}/../../build/bin"
        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
        local OLDWORKINGDIRECTORY=$(pwd)
@@ -91,7 +92,7 @@ setupenvironment() {
        mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d
        mkdir -p var/cache var/lib var/log
        mkdir -p var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
-       local STATUSFILE=$(echo "$(basename $0)" | sed 's/^test-/status-/')
+       local STATUSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/status-/' -e 's/^skip-/status-/')
        if [ -f "${TESTDIR}/${STATUSFILE}" ]; then
                cp "${TESTDIR}/${STATUSFILE}" var/lib/dpkg/status
        else
@@ -101,7 +102,7 @@ setupenvironment() {
        mkdir -p usr/lib/apt
        ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods
        cd ..
-       local PACKAGESFILE=$(echo "$(basename $0)" | sed 's/^test-/Packages-/')
+       local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
        if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then
                cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/Packages
        else
@@ -210,7 +211,7 @@ buildpackage() {
        fi
        local BUILT="$(dpkg-buildpackage -uc -us -a$ARCH 2> /dev/null)"
        local PKGS="$( echo "$BUILT" | grep '^dpkg-deb: building package' | cut -d'/' -f 2 | sed -e "s#'\.##")"
-       local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._-]*$')"
+       local SRCS="$( echo "$BUILT" | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')"
        cd - > /dev/null
        for PKG in $PKGS; do
                echo "pool/${PKG}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist
@@ -304,7 +305,7 @@ buildaptftparchivedirectorystructure() {
 }
 
 buildaptarchivefromincoming() {
-       msginfo "Build APT archive for ${CCMD}$0${CINFO} based on incoming packages…"
+       msginfo "Build APT archive for ${CCMD}$(basename $0)${CINFO} based on incoming packages…"
        cd aptarchive
        [ -e pool ] || ln -s ../incoming pool
        [ -e ftparchive.conf ] || createaptftparchiveconfig
@@ -321,7 +322,7 @@ buildaptarchivefromincoming() {
 }
 
 buildaptarchivefromfiles() {
-       msginfo "Build APT archive for ${CCMD}$0${CINFO} based on prebuild files…"
+       msginfo "Build APT archive for ${CCMD}$(basename $0)${CINFO} based on prebuild files…"
        cd aptarchive
        if [ -f Packages ]; then
                msgninfo "\tPackages file… "
@@ -483,7 +484,7 @@ N: No packages found"
        local ARCH=$(dpkg-architecture -qDEB_HOST_ARCH_CPU)
        eval `apt-config shell ARCH APT::Architecture`
        echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE
-       aptcache show $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
+       aptcache show -q=0 $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
        rm $COMPAREFILE
 }