do the right thing(TM) even if the (unfinished) testcase is named

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index ba5f9dfa3fb15842cfc8fa2818ba89915d7015d0..d832bedbef5010bfdd3b3f23879a8a0d69a573da 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -79,7 +79,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)
@@ -88,10 +88,10 @@ setupenvironment() {
        cd $TMPWORKINGDIRECTORY
        mkdir rootdir aptarchive keys
        cd rootdir
-       mkdir -p etc/apt/apt.conf.d etc/apt/sources.list.d etc/apt/trusted.gpg.d etc/apt/preferences.d var/cache
-       mkdir -p var/log/apt var/lib/apt
+       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 +101,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
@@ -304,7 +304,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 +321,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 +483,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
 }