]> git.saurik.com Git - apt.git/blobdiff - test/integration/framework
projects / apt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add wrapper around dpkg to be able to use it easily in the tests
[apt.git] / test / integration / framework
diff --git a/test/integration/framework b/test/integration/framework
index a4c857f17318c3bd3d7d61a24d0863f725ea536e..ba5f9dfa3fb15842cfc8fa2818ba89915d7015d0 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -72,26 +72,32 @@ aptconfig() { runapt apt-config $*; }
 aptcache() { runapt apt-cache $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
 aptcache() { runapt apt-cache $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
+dpkg() {
+       $(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
+}
 
 setupenvironment() {
 
 setupenvironment() {
-       local TMPWORKINGDIRECTORY=$(mktemp -d)
+       TMPWORKINGDIRECTORY=$(mktemp -d)
        local TESTDIR=$(readlink -f $(dirname $0))
        msgninfo "Preparing environment for ${CCMD}$0${CINFO} in ${TMPWORKINGDIRECTORY}… "
        BUILDDIRECTORY="${TESTDIR}/../../build/bin"
        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
        local OLDWORKINGDIRECTORY=$(pwd)
        local TESTDIR=$(readlink -f $(dirname $0))
        msgninfo "Preparing environment for ${CCMD}$0${CINFO} in ${TMPWORKINGDIRECTORY}… "
        BUILDDIRECTORY="${TESTDIR}/../../build/bin"
        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
        local OLDWORKINGDIRECTORY=$(pwd)
-       trap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+       CURRENTTRAP="cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY"
+       trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
        cd $TMPWORKINGDIRECTORY
        cd $TMPWORKINGDIRECTORY
-       mkdir rootdir aptarchive
+       mkdir rootdir aptarchive keys
        cd rootdir
        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 var/lib/dpkg
-       mkdir -p var/cache/apt/archives/partial var/lib/apt/lists/partial
+       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 var/lib/dpkg/info var/lib/dpkg/updates var/lib/dpkg/triggers
        local STATUSFILE=$(echo "$(basename $0)" | sed 's/^test-/status-/')
        if [ -f "${TESTDIR}/${STATUSFILE}" ]; then
                cp "${TESTDIR}/${STATUSFILE}" var/lib/dpkg/status
        else
                touch var/lib/dpkg/status
        fi
        local STATUSFILE=$(echo "$(basename $0)" | sed 's/^test-/status-/')
        if [ -f "${TESTDIR}/${STATUSFILE}" ]; then
                cp "${TESTDIR}/${STATUSFILE}" var/lib/dpkg/status
        else
                touch var/lib/dpkg/status
        fi
+       touch var/lib/dpkg/available
        mkdir -p usr/lib/apt
        ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods
        cd ..
        mkdir -p usr/lib/apt
        ln -s ${BUILDDIRECTORY}/methods usr/lib/apt/methods
        cd ..
@@ -101,9 +107,17 @@ setupenvironment() {
        else
                touch aptarchive/Packages
        fi
        else
                touch aptarchive/Packages
        fi
-       echo "RootDir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
+       cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/
+       ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
+       echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf
        echo "Debug::NoLocking \"true\";" >> aptconfig.conf
        echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
        echo "Debug::NoLocking \"true\";" >> aptconfig.conf
        echo "APT::Get::Show-User-Simulation-Note \"false\";" >> aptconfig.conf
+       echo "Dir::Bin::dpkg \"fakeroot\";" >> aptconfig.conf
+       echo "DPKG::options:: \"dpkg\";" >> 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
+       echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
        export LC_ALL=C
        msgdone "info"
 }
        export LC_ALL=C
        msgdone "info"
 }
@@ -118,33 +132,39 @@ configarchitecture() {
        done
 }
 
        done
 }
 
-buildsimplenativepackage() {
+setupsimplenativepackage() {
        local NAME="$1"
        local ARCH="$2"
        local VERSION="$3"
        local RELEASE="${4:-unstable}"
        local DEPENDENCIES="$5"
        local DESCRIPTION="$6"
        local NAME="$1"
        local ARCH="$2"
        local VERSION="$3"
        local RELEASE="${4:-unstable}"
        local DEPENDENCIES="$5"
        local DESCRIPTION="$6"
-       msgndebug "Build package ${CCMD}${NAME}=${VERSION}/${RELEASE}${CDEBUG}… "
+       local SECTION="${7:-others}"
+       local DISTSECTION
+       if [ "$SECTION" = "$(echo "$SECTION" | cut -d'/' -f 2)" ]; then
+               DISTSECTION="main"
+       else
+               DISTSECTION="$(echo "$SECTION" | cut -d'/' -f 1)"
+       fi
        local BUILDDIR=incoming/${NAME}-${VERSION}
        mkdir -p ${BUILDDIR}/debian/source
        cd ${BUILDDIR}
        echo "* most suckless software product ever" > FEATURES
        local BUILDDIR=incoming/${NAME}-${VERSION}
        mkdir -p ${BUILDDIR}/debian/source
        cd ${BUILDDIR}
        echo "* most suckless software product ever" > FEATURES
-       test -e debian/copyright || (echo "Copyleft by Joe Sixpack $(date +%Y)" > debian/copyright)
-       test -e debian/changelog || (echo "$NAME ($VERSION) $RELEASE; urgency=low
+       test -e debian/copyright || echo "Copyleft by Joe Sixpack $(date +%Y)" > debian/copyright
+       test -e debian/changelog || echo "$NAME ($VERSION) $RELEASE; urgency=low
 
   * Initial release
 
 
   * Initial release
 
- -- Joe Sixpack <joe@example.org>  $(date -R)" > debian/changelog)
-       test -e debian/control || (echo "Source: $NAME
-Section: admin
+ -- Joe Sixpack <joe@example.org>  $(date -R)" > debian/changelog
+       test -e debian/control || echo "Source: $NAME
+Section: $SECTION
 Priority: optional
 Maintainer: Joe Sixpack <joe@example.org>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.9.1
 
 Package: $NAME
 Priority: optional
 Maintainer: Joe Sixpack <joe@example.org>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.9.1
 
 Package: $NAME
-Architecture: $ARCH" > debian/control)
+Architecture: $ARCH" > debian/control
        test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> debian/control
        if [ -z "$DESCRIPTION" ]; then
                echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
        test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> debian/control
        if [ -z "$DESCRIPTION" ]; then
                echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
@@ -154,17 +174,54 @@ Architecture: $ARCH" > debian/control)
        else
                echo "Description: $DESCRIPTION" >> debian/control
        fi
        else
                echo "Description: $DESCRIPTION" >> debian/control
        fi
-       test -e debian/compat || (echo "7" > debian/compat)
-       test -e debian/source/format || (echo "3.0 (native)" > debian/source/format)
+       test -e debian/compat || echo "7" > debian/compat
+       test -e debian/source/format || echo "3.0 (native)" > debian/source/format
        test -e debian/rules || cp /usr/share/doc/debhelper/examples/rules.tiny debian/rules
        test -e debian/rules || cp /usr/share/doc/debhelper/examples/rules.tiny debian/rules
-       dpkg-buildpackage -uc -us -a$ARCH > /dev/null 2> /dev/null
        cd - > /dev/null
        cd - > /dev/null
-       rm -rf $BUILDDIR
-       msgdone "debug"
+}
+
+buildsimplenativepackage() {
+       local NAME="$1"
+       local ARCH="$2"
+       local VERSION="$3"
+       local RELEASE="${4:-unstable}"
+       local DEPENDENCIES="$5"
+       local DESCRIPTION="$6"
+       local SECTION="${7:-others}"
+       local DISTSECTION
+       if [ "$SECTION" = "$(echo "$SECTION" | cut -d'/' -f 2)" ]; then
+               DISTSECTION="main"
+       else
+               DISTSECTION="$(echo "$SECTION" | cut -d'/' -f 1)"
+       fi
+       setupsimplenativepackage "$NAME" "$ARCH" "$VERSION" "$RELEASE" "$DEPENDENCIES" "$DESCRIPTION" "$SECTION"
+       buildpackage "incoming/${NAME}-${VERSION}" "$RELEASE" "$DISTSECTION"
+       rm -rf "incoming/${NAME}-${VERSION}"
+}
+
+buildpackage() {
+       local BUILDDIR=$1
+       local RELEASE=$2
+       local SECTION=$3
+       msgninfo "Build package $(echo "$BUILDDIR" | grep -o '[^/]*$') for ${RELEASE} in ${SECTION}… "
+       cd $BUILDDIR
+       if [ "$ARCH" = "all" ]; then
+               ARCH="$(dpkg-architecture -qDEB_HOST_ARCH 2> /dev/null)"
+       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._-]*$')"
+       cd - > /dev/null
+       for PKG in $PKGS; do
+               echo "pool/${PKG}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.pkglist
+       done
+       for SRC in $SRCS; do
+               echo "pool/${SRC}" >> ${TMPWORKINGDIRECTORY}/incoming/${RELEASE}.${SECTION}.srclist
+       done
+       msgdone "info"
 }
 
 buildaptarchive() {
 }
 
 buildaptarchive() {
-       msgninfo "Build APT archive for ${CCMD}$0${CINFO} based on "
        if [ -d incoming ]; then
                buildaptarchivefromincoming $*
        else
        if [ -d incoming ]; then
                buildaptarchivefromincoming $*
        else
@@ -174,6 +231,10 @@ buildaptarchive() {
 
 createaptftparchiveconfig() {
        local ARCHS="$(find pool/ -name '*.deb' | grep -oE '_[a-z0-9-]+\.deb$' | sort | uniq | sed -e '/^_all.deb$/ d' -e 's#^_\([a-z0-9-]*\)\.deb$#\1#' | tr '\n' ' ')"
 
 createaptftparchiveconfig() {
        local ARCHS="$(find pool/ -name '*.deb' | grep -oE '_[a-z0-9-]+\.deb$' | sort | uniq | sed -e '/^_all.deb$/ d' -e 's#^_\([a-z0-9-]*\)\.deb$#\1#' | tr '\n' ' ')"
+       if [ -z "$ARCHS" ]; then
+               # the pool is empty, so we will operate on faked packages - let us use the configured archs
+               ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
+       fi
        echo -n 'Dir {
        ArchiveDir "' >> ftparchive.conf
        echo -n $(readlink -f .) >> ftparchive.conf
        echo -n 'Dir {
        ArchiveDir "' >> ftparchive.conf
        echo -n $(readlink -f .) >> ftparchive.conf
@@ -181,6 +242,14 @@ createaptftparchiveconfig() {
        CacheDir "' >> ftparchive.conf
        echo -n $(readlink -f ..) >> ftparchive.conf
        echo -n '";
        CacheDir "' >> ftparchive.conf
        echo -n $(readlink -f ..) >> ftparchive.conf
        echo -n '";
+       FileListDir "' >> ftparchive.conf
+       echo -n $(readlink -f pool/) >> ftparchive.conf
+       echo -n '";
+};
+Default {
+       Packages::Compress ". gzip bzip2 lzma";
+       Sources::Compress ". gzip bzip2 lzma";
+       Contents::Compress ". gzip bzip2 lzma";
 };
 TreeDefault {
        Directory "pool/";
 };
 TreeDefault {
        Directory "pool/";
@@ -199,42 +268,60 @@ APT {
                };
        };
 };' >> ftparchive.conf
                };
        };
 };' >> ftparchive.conf
-       if [ -z "$1" ]; then
-               echo -n 'tree "dists/unstable" {
+       for DIST in $(find ./pool/ -maxdepth 1 -name '*.pkglist' -type f | cut -d'/' -f 3 | cut -d'.' -f 1 | sort | uniq); do
+               echo -n 'tree "dists/' >> ftparchive.conf
+               echo -n "$DIST" >> ftparchive.conf
+               echo -n '" {
        Architectures "' >> ftparchive.conf
                echo -n "$ARCHS" >> ftparchive.conf
        Architectures "' >> ftparchive.conf
                echo -n "$ARCHS" >> ftparchive.conf
-               echo 'source";
-       Sections "main";
+               echo -n 'source";
+       FileList "' >> ftparchive.conf
+               echo -n "${DIST}.\$(SECTION).pkglist" >> ftparchive.conf
+               echo -n '";
+       SourceFileList "' >> ftparchive.conf
+               echo -n "${DIST}.\$(SECTION).srclist" >> ftparchive.conf
+               echo -n '";
+       Sections "' >> ftparchive.conf
+               echo -n "$(find ./pool/ -maxdepth 1 -name "${DIST}.*.pkglist" -type f | cut -d'/' -f 3 | cut -d'.' -f 2 | sort | uniq | tr '\n' ' ')" >> ftparchive.conf
+               echo '";
 };' >> ftparchive.conf
 };' >> ftparchive.conf
-       fi
+       done
 }
 
 buildaptftparchivedirectorystructure() {
 }
 
 buildaptftparchivedirectorystructure() {
-       local ARCHS="$(find pool/ -name '*.deb' | grep -oE '_[a-z0-9-]+\.deb$' | sort | uniq | sed -e '/^_all.deb$/ d' -e 's#^_\([a-z0-9-]*\)\.deb$#\1#')"
-       for arch in $ARCHS; do
-               mkdir -p dists/unstable/main/binary-${arch}
+       local DISTS="$(grep -i '^tree ' ftparchive.conf | cut -d'/' -f 2 | sed -e 's#".*##')"
+       for DIST in $DISTS; do
+               local SECTIONS="$(grep -i -A 5 "dists/$DIST" ftparchive.conf | grep -i 'Sections' | cut -d'"' -f 2)"
+               for SECTION in $SECTIONS; do
+                       local ARCHS="$(grep -A 5 "dists/$DIST" ftparchive.conf | grep Architectures | cut -d'"' -f 2 | sed -e 's#source##')"
+                       for ARCH in $ARCHS; do
+                               mkdir -p dists/${DIST}/${SECTION}/binary-${ARCH}
+                       done
+                       mkdir -p dists/${DIST}/${SECTION}/source
+                       mkdir -p dists/${DIST}/${SECTION}/i18n
+               done
        done
        done
-       mkdir -p dists/unstable/main/source
-       mkdir -p dists/unstable/main/i18n
 }
 
 buildaptarchivefromincoming() {
 }
 
 buildaptarchivefromincoming() {
-       msginfo "incoming packages…"
+       msginfo "Build APT archive for ${CCMD}$0${CINFO} based on incoming packages…"
        cd aptarchive
        [ -e pool ] || ln -s ../incoming pool
        [ -e ftparchive.conf ] || createaptftparchiveconfig
        [ -e dists ] || buildaptftparchivedirectorystructure
        cd aptarchive
        [ -e pool ] || ln -s ../incoming pool
        [ -e ftparchive.conf ] || createaptftparchiveconfig
        [ -e dists ] || buildaptftparchivedirectorystructure
+       msgninfo "\tGenerate Packages, Sources and Contents files… "
        aptftparchive -qq generate ftparchive.conf
        aptftparchive -qq generate ftparchive.conf
+       msgdone "info"
+       msgninfo "\tGenerate Release files… "
        for dir in $(find ./dists -mindepth 1 -maxdepth 1 -type d); do
        for dir in $(find ./dists -mindepth 1 -maxdepth 1 -type d); do
-               aptftparchive -qq release $dir > $dir/Release
-               sed -i -e '/0 Release$/ d' $dir/Release # remove the self reference
+               aptftparchive -qq release $dir -o APT::FTPArchive::Release::Codename="$(echo "$dir" | cut -d'/' -f 3)" | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
        done
        cd - > /dev/null
        msgdone "info"
 }
 
 buildaptarchivefromfiles() {
        done
        cd - > /dev/null
        msgdone "info"
 }
 
 buildaptarchivefromfiles() {
-       msginfo "prebuild files…"
+       msginfo "Build APT archive for ${CCMD}$0${CINFO} based on prebuild files…"
        cd aptarchive
        if [ -f Packages ]; then
                msgninfo "\tPackages file… "
        cd aptarchive
        if [ -f Packages ]; then
                msgninfo "\tPackages file… "
@@ -250,13 +337,26 @@ buildaptarchivefromfiles() {
                cat Sources | lzma > Sources.lzma
                msgdone "info"
        fi
                cat Sources | lzma > Sources.lzma
                msgdone "info"
        fi
-       aptftparchive -qq release . > Release
-       sed -i -e '/0 Release$/ d' Release # remove the self reference
+       msgninfo "\tRelease file… "
+       aptftparchive -qq release . | sed -e '/0 Release$/ d' > Release # remove the self reference
+       msgdone "info"
        cd ..
 }
 
        cd ..
 }
 
-setupaptarchive() {
-       buildaptarchive
+setupdistsaptarchive() {
+       local APTARCHIVE=$(readlink -f ./aptarchive)
+       rm -f root/etc/apt/sources.list.d/apt-test-*-deb.list
+       rm -f root/etc/apt/sources.list.d/apt-test-*-deb-src.list
+       for DISTS in $(find ./aptarchive/dists/ -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 4); do
+               SECTIONS=$(find ./aptarchive/dists/${DISTS}/ -mindepth 1 -maxdepth 1 -type d | cut -d'/' -f 5 | tr '\n' ' ')
+               msgninfo "\tadd deb and deb-src sources.list lines for ${CCMD}${DISTS} ${SECTIONS}${CINFO}… "
+               echo "deb file://$APTARCHIVE $DISTS $SECTIONS" > rootdir/etc/apt/sources.list.d/apt-test-${DISTS}-deb.list
+               echo "deb-src file://$APTARCHIVE $DISTS $SECTIONS" > rootdir/etc/apt/sources.list.d/apt-test-${DISTS}-deb-src.list
+               msgdone "info"
+       done
+}
+
+setupflataptarchive() {
        local APTARCHIVE=$(readlink -f ./aptarchive)
        if [ -f ${APTARCHIVE}/Packages ]; then
                msgninfo "\tadd deb sources.list line… "
        local APTARCHIVE=$(readlink -f ./aptarchive)
        if [ -f ${APTARCHIVE}/Packages ]; then
                msgninfo "\tadd deb sources.list line… "
@@ -272,10 +372,53 @@ setupaptarchive() {
        else
                rm -f rootdir/etc/apt/sources.list.d/apt-test-archive-deb-src.list
        fi
        else
                rm -f rootdir/etc/apt/sources.list.d/apt-test-archive-deb-src.list
        fi
+}
+
+setupaptarchive() {
+       buildaptarchive
+       if [ -e aptarchive/dists ]; then
+               setupdistsaptarchive
+       else
+               setupflataptarchive
+       fi
+       signreleasefiles
+       msgninfo "\tSync APT's cache with the archive… "
        aptget update -qq
        aptget update -qq
+       msgdone "info"
 }
 
 }
 
-diff() {
+signreleasefiles() {
+       local SIGNER="${1:-Joe Sixpack}"
+       msgninfo "\tSign archive with $SIGNER key… "
+       local SECKEYS=""
+       for KEY in $(find keys/ -name '*.sec'); do
+               SECKEYS="$SECKEYS --secret-keyring $KEY"
+       done
+       local PUBKEYS=""
+       for KEY in $(find keys/ -name '*.pub'); do
+               PUBKEYS="$PUBKEYS --keyring $KEY"
+       done
+       for RELEASE in $(find aptarchive/ -name Release); do
+               gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" -abs -o ${RELEASE}.gpg ${RELEASE}
+       done
+       msgdone "info"
+}
+
+changetowebserver() {
+       if which weborf > /dev/null; then
+               weborf -xb aptarchive/ 2>&1 > /dev/null &
+               CURRENTTRAP="kill $(ps | grep weborf | sed -e 's#^[ ]*##' | cut -d' ' -f 1); $CURRENTTRAP"
+               trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+               local APTARCHIVE="file://$(readlink -f ./aptarchive)"
+               for LIST in $(find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list'); do
+                       sed -i $LIST -e "s#$APTARCHIVE#http://localhost:8080/#"
+               done
+               return 0
+       fi
+       return 1
+}
+
+checkdiff() {
        local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
        if [ -n "$DIFFTEXT" ]; then
                echo
        local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
        if [ -n "$DIFFTEXT" ]; then
                echo
@@ -286,12 +429,23 @@ diff() {
        fi
 }
 
        fi
 }
 
+testfileequal() {
+       local FILE="$1"
+       shift
+       msgtest "Test for correctness of file" "$FILE"
+       if [ -z "$*" ]; then
+               echo -n "" | checkdiff $FILE - && msgpass || msgfail
+       else
+               echo "$*" | checkdiff $FILE - && msgpass || msgfail
+       fi
+}
+
 testequal() {
        local COMPAREFILE=$(mktemp)
        echo "$1" > $COMPAREFILE
        shift
        msgtest "Test for equality of" "$*"
 testequal() {
        local COMPAREFILE=$(mktemp)
        echo "$1" > $COMPAREFILE
        shift
        msgtest "Test for equality of" "$*"
-       $* 2>&1 | diff $COMPAREFILE - && msgpass || msgfail
+       $* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
        rm $COMPAREFILE
 }
 
        rm $COMPAREFILE
 }
 
@@ -304,10 +458,10 @@ testequalor2() {
        shift 2
        msgtest "Test for equality OR of" "$*"
        $* 2>&1 1> $COMPAREAGAINST
        shift 2
        msgtest "Test for equality OR of" "$*"
        $* 2>&1 1> $COMPAREAGAINST
-       (diff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null ||
-               diff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null) && msgpass ||
-               ( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(diff $COMPAREFILE1 $COMPAREAGAINST)" \
-                      "\n${CINFO}Diff against OR 2${CNORMAL}" "$(diff $COMPAREFILE2 $COMPAREAGAINST)" &&
+       (checkdiff $COMPAREFILE1 $COMPAREAGAINST 1> /dev/null ||
+               checkdiff $COMPAREFILE2 $COMPAREAGAINST 1> /dev/null) && msgpass ||
+               ( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(checkdiff $COMPAREFILE1 $COMPAREAGAINST)" \
+                      "\n${CINFO}Diff against OR 2${CNORMAL}" "$(checkdiff $COMPAREFILE2 $COMPAREAGAINST)" &&
                  msgfail )
        rm $COMPAREFILE1 $COMPAREFILE2 $COMPAREAGAINST
 }
                  msgfail )
        rm $COMPAREFILE1 $COMPAREFILE2 $COMPAREAGAINST
 }
@@ -329,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
        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 | diff $COMPAREFILE - && msgpass || msgfail
+       aptcache show $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
        rm $COMPAREFILE
 }
 
        rm $COMPAREFILE
 }
 
APT (for Cydia)