test the xz compressor, too

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 7af59deb01ad17599859faaaef1b3df0def0ddee..71e7e476c92698cc6a11c81a25df14b731de471d 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -39,6 +39,10 @@ fi
 if [ $MSGLEVEL -le 2 ]; then
        msgmsg() { true; }
        msgnmsg() { true; }
 if [ $MSGLEVEL -le 2 ]; then
        msgmsg() { true; }
        msgnmsg() { true; }

+       msgtest() { true; }
+       msgpass() { echo -n " ${CPASS}P${CNORMAL}" >&2; }
+       msgskip() { echo -n " ${CWARNING}S${CNORMAL}" >&2; }
+       msgfail() { echo -n " ${CFAIL}FAIL${CNORMAL}" >&2; }

 fi
 if [ $MSGLEVEL -le 3 ]; then
        msginfo() { true; }
 fi
 if [ $MSGLEVEL -le 3 ]; then
        msginfo() { true; }


@@ -75,6 +79,7 @@ aptcache() { runapt apt-cache $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
 aptkey() { runapt apt-key $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
 aptkey() { runapt apt-key $*; }

+aptmark() { runapt apt-mark $*; }

 dpkg() {
        $(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
 }
 dpkg() {
        $(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
 }


@@ -88,6 +93,11 @@ aptitude() {
        fi
 }
 
        fi
 }
 

+addtrap() {
+       CURRENTTRAP="$CURRENTTRAP $1"
+       trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+}
+

 setupenvironment() {
        TMPWORKINGDIRECTORY=$(mktemp -d)
        local TESTDIR=$(readlink -f $(dirname $0))
 setupenvironment() {
        TMPWORKINGDIRECTORY=$(mktemp -d)
        local TESTDIR=$(readlink -f $(dirname $0))


@@ -95,8 +105,7 @@ setupenvironment() {
        BUILDDIRECTORY="${TESTDIR}/../../build/bin"
        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
        local OLDWORKINGDIRECTORY=$(pwd)
        BUILDDIRECTORY="${TESTDIR}/../../build/bin"
        test -x "${BUILDDIRECTORY}/apt-get" || msgdie "You need to build tree first"
        local OLDWORKINGDIRECTORY=$(pwd)

-       CURRENTTRAP="cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY"
-       trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+       addtrap "cd /; rm -rf $TMPWORKINGDIRECTORY; cd $OLDWORKINGDIRECTORY;"

        cd $TMPWORKINGDIRECTORY
        mkdir rootdir aptarchive keys
        cd rootdir
        cd $TMPWORKINGDIRECTORY
        mkdir rootdir aptarchive keys
        cd rootdir


@@ -116,14 +125,10 @@ setupenvironment() {
        local PACKAGESFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Packages-/' -e 's/^skip-/Packages-/')
        if [ -f "${TESTDIR}/${PACKAGESFILE}" ]; then
                cp "${TESTDIR}/${PACKAGESFILE}" aptarchive/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
-               touch aptarchive/Packages

        fi
        local SOURCESSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Sources-/' -e 's/^skip-/Sources-/')
        if [ -f "${TESTDIR}/${SOURCESSFILE}" ]; then
                cp "${TESTDIR}/${SOURCESSFILE}" aptarchive/Sources
        fi
        local SOURCESSFILE=$(echo "$(basename $0)" | sed -e 's/^test-/Sources-/' -e 's/^skip-/Sources-/')
        if [ -f "${TESTDIR}/${SOURCESSFILE}" ]; then
                cp "${TESTDIR}/${SOURCESSFILE}" aptarchive/Sources

-       else
-               touch aptarchive/Sources

        fi
        cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/
        ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg
        fi
        cp $(find $TESTDIR -name '*.pub' -o -name '*.sec') keys/
        ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg


@@ -138,6 +143,7 @@ setupenvironment() {
        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
        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

+       echo 'quiet::NoUpdate "true";' >> aptconfig.conf

        export LC_ALL=C
        msgdone "info"
 }
        export LC_ALL=C
        msgdone "info"
 }


@@ -183,8 +189,12 @@ Maintainer: Joe Sixpack <joe@example.org>
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.9.1
 
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.9.1
 

-Package: $NAME
-Architecture: $ARCH" > debian/control
+Package: $NAME" > debian/control
+       if [ "$ARCH" = 'all' ]; then
+               echo "Architecture: all" >> debian/control
+       else
+               echo "Architecture: any" >> debian/control
+       fi

        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}


@@ -214,9 +224,60 @@ buildsimplenativepackage() {
        else
                DISTSECTION="$(echo "$SECTION" | cut -d'/' -f 1)"
        fi
        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}"
+       local BUILDDIR=${TMPWORKINGDIRECTORY}/incoming/${NAME}-${VERSION}
+
+       msgninfo "Build package ${NAME} in ${VERSION} for ${RELEASE} in ${DISTSECTION}… "
+       mkdir -p $BUILDDIR/debian/source
+       echo "* most suckless software product ever" > ${BUILDDIR}/FEATURES
+       echo "#!/bin/sh
+echo '$NAME says \"Hello!\"'" > ${BUILDDIR}/${NAME}
+
+       echo "Copyleft by Joe Sixpack $(date +%Y)" > ${BUILDDIR}/debian/copyright
+       echo "$NAME ($VERSION) $RELEASE; urgency=low
+
+  * Initial release
+
+ -- Joe Sixpack <joe@example.org>  $(date -R)" > ${BUILDDIR}/debian/changelog
+       echo "Source: $NAME
+Section: $SECTION
+Priority: optional
+Maintainer: Joe Sixpack <joe@example.org>
+Standards-Version: 3.9.1
+
+Package: $NAME" > ${BUILDDIR}/debian/control
+       if [ "$ARCH" = 'all' ]; then
+               echo "Architecture: all" >> ${BUILDDIR}/debian/control
+       else
+               echo "Architecture: any" >> ${BUILDDIR}/debian/control
+       fi
+       test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> ${BUILDDIR}/debian/control
+       if [ -z "$DESCRIPTION" ]; then
+               echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
+ If you find such a package installed on your system,
+ YOU did something horribly wrong! They are autogenerated
+ und used only by testcases for APT and surf no other propose…" >> ${BUILDDIR}/debian/control
+       else
+               echo "Description: $DESCRIPTION" >> ${BUILDIR}/debian/control
+       fi
+       echo '3.0 (native)' > ${BUILDDIR}/debian/source/format
+       local SRCS="$( (cd ${BUILDDIR}/..; dpkg-source -b ${NAME}-${VERSION} 2>&1) | grep '^dpkg-source: info: building' | grep -o '[a-z0-9._+~-]*$')"
+
+       mkdir -p ${BUILDDIR}/debian/tmp/DEBIAN ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME} ${BUILDDIR}/debian/tmp/usr/bin
+       cp ${BUILDDIR}/debian/copyright ${BUILDDIR}/debian/changelog ${BUILDDIR}/FEATURES ${BUILDDIR}/debian/tmp/usr/share/doc/${NAME}
+       cp ${BUILDDIR}/${NAME} ${BUILDDIR}/debian/tmp/usr/bin
+       (cd ${BUILDDIR}; dpkg-gencontrol -DArchitecture=$ARCH)
+       (cd ${BUILDDIR}/debian/tmp; md5sum $(find usr/ -type f) > DEBIAN/md5sums)
+
+       dpkg-deb --build ${BUILDDIR}/debian/tmp ${BUILDDIR}/.. 2> /dev/null > /dev/null
+       echo "pool/${NAME}_${VERSION}_${ARCH}.deb" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.pkglist
+       for SRC in $SRCS; do
+               echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist
+       done
+       mkdir -p ${BUILDDIR}/../${NAME}_${VERSION}
+       cp ${BUILDDIR}/debian/changelog ${BUILDDIR}/../${NAME}_${VERSION}/
+       cp ${BUILDDIR}/debian/changelog ${BUILDDIR}/../${NAME}_${VERSION}.changelog
+       rm -rf "${BUILDDIR}"
+       msgdone "info"

 }
 
 buildpackage() {
 }
 
 buildpackage() {


@@ -267,9 +328,11 @@ createaptftparchiveconfig() {
        echo -n '";
 };
 Default {
        echo -n '";
 };
 Default {

-       Packages::Compress ". gzip bzip2 lzma";
-       Sources::Compress ". gzip bzip2 lzma";
-       Contents::Compress ". gzip bzip2 lzma";
+       Packages::Compress ". gzip bzip2 lzma xz";
+       Sources::Compress ". gzip bzip2 lzma xz";
+       Contents::Compress ". gzip bzip2 lzma xz";
+       Translation::Compress ". gzip bzip2 lzma xz";
+       LongDescription "false";

 };
 TreeDefault {
        Directory "pool/";
 };
 TreeDefault {
        Directory "pool/";


@@ -341,10 +404,11 @@ insertpackage() {
                echo "Package: $NAME
 Priority: optional
 Section: other
                echo "Package: $NAME
 Priority: optional
 Section: other

-Installed-Size: 23356
+Installed-Size: 42

 Maintainer: Joe Sixpack <joe@example.org>
 Architecture: $ARCH
 Maintainer: Joe Sixpack <joe@example.org>
 Architecture: $ARCH

-Version: $VERSION" >> $FILE
+Version: $VERSION
+Filename: pool/main/${NAME}/${NAME}_${VERSION}_${ARCH}.deb" >> $FILE

                test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
                echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
  If you find such a package installed on your system,
                test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
                echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}
  If you find such a package installed on your system,


@@ -374,6 +438,7 @@ buildaptarchivefromfiles() {
                cat ${line} | gzip > ${line}.gz
                cat ${line} | bzip2 > ${line}.bz2
                cat ${line} | lzma > ${line}.lzma
                cat ${line} | gzip > ${line}.gz
                cat ${line} | bzip2 > ${line}.bz2
                cat ${line} | lzma > ${line}.lzma

+               cat ${line} | xz > ${line}.xz

                msgdone "info"
        done
        generatereleasefiles
                msgdone "info"
        done
        generatereleasefiles


@@ -381,11 +446,15 @@ buildaptarchivefromfiles() {
 
 generatereleasefiles() {
        msgninfo "\tGenerate Release files… "
 
 generatereleasefiles() {
        msgninfo "\tGenerate Release files… "

+       local DATE="${1:-now}"

        if [ -e aptarchive/dists ]; then
        if [ -e aptarchive/dists ]; then

+               for dir in $(find ./aptarchive/dists -mindepth 3 -maxdepth 3 -type d -name 'i18n'); do
+                       aptftparchive -qq release $dir -o APT::FTPArchive::Release::Patterns::='Translation-*' > $dir/Index
+               done

                for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do
                        local CODENAME="$(echo "$dir" | cut -d'/' -f 4)"
                for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do
                        local CODENAME="$(echo "$dir" | cut -d'/' -f 4)"

-                       aptftparchive -qq release $dir -o APT::FTPArchive::Release::Codename="${CODENAME}" | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
-                       if [ "$CODENAME" = "experimental" ]; then
+                       aptftparchive -qq release $dir -o APT::FTPArchive::Release::Suite="${CODENAME}" -o APT::FTPArchive::Release::Codename="${CODENAME}" | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
+                       if [ "$CODENAME" = "experimental" -o "$CODENAME" = "experimental2" ]; then

                                sed -i '/^Date: / a\
 NotAutomatic: yes' $dir/Release
                        fi
                                sed -i '/^Date: / a\
 NotAutomatic: yes' $dir/Release
                        fi


@@ -393,6 +462,11 @@ NotAutomatic: yes' $dir/Release
        else
                aptftparchive -qq release ./aptarchive | sed -e '/0 Release$/ d' > aptarchive/Release # remove the self reference
        fi
        else
                aptftparchive -qq release ./aptarchive | sed -e '/0 Release$/ d' > aptarchive/Release # remove the self reference
        fi

+       if [ "$DATE" != "now" ]; then
+               for release in $(find ./aptarchive -name 'Release'); do
+                       touch -d "$1" $release
+               done
+       fi

        msgdone "info"
 }
 
        msgdone "info"
 }
 


@@ -453,6 +527,7 @@ signreleasefiles() {
        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
        for RELEASE in $(find aptarchive/ -name Release); do
                gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" -abs -o ${RELEASE}.gpg ${RELEASE}

+               gpg --yes --no-default-keyring $SECKEYS $PUBKEYS --default-key "$SIGNER" --clearsign -o "$(echo "${RELEASE}" | sed 's#/Release$#/InRelease#')" $RELEASE

        done
        msgdone "info"
 }
        done
        msgdone "info"
 }


@@ -460,8 +535,7 @@ signreleasefiles() {
 changetowebserver() {
        if which weborf > /dev/null; then
                weborf -xb aptarchive/ 2>&1 > /dev/null &
 changetowebserver() {
        if which weborf > /dev/null; then
                weborf -xb aptarchive/ 2>&1 > /dev/null &

-               CURRENTTRAP="kill $!; $CURRENTTRAP"
-               trap "$CURRENTTRAP" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+               addtrap "kill $!;"

                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/#"
                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/#"


@@ -495,17 +569,18 @@ testfileequal() {
 
 testequal() {
        local COMPAREFILE=$(mktemp)
 
 testequal() {
        local COMPAREFILE=$(mktemp)

+       addtrap "rm $COMPAREFILE;"

        echo "$1" > $COMPAREFILE
        shift
        msgtest "Test for equality of" "$*"
        $* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
        echo "$1" > $COMPAREFILE
        shift
        msgtest "Test for equality of" "$*"
        $* 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail

-       rm $COMPAREFILE

 }
 
 testequalor2() {
        local COMPAREFILE1=$(mktemp)
        local COMPAREFILE2=$(mktemp)
        local COMPAREAGAINST=$(mktemp)
 }
 
 testequalor2() {
        local COMPAREFILE1=$(mktemp)
        local COMPAREFILE2=$(mktemp)
        local COMPAREAGAINST=$(mktemp)

+       addtrap "rm $COMPAREFILE1 $COMPAREFILE2 $COMPAREAGAINST;"

        echo "$1" > $COMPAREFILE1
        echo "$2" > $COMPAREFILE2
        shift 2
        echo "$1" > $COMPAREFILE1
        echo "$2" > $COMPAREFILE2
        shift 2


@@ -516,16 +591,15 @@ testequalor2() {
                ( echo "\n${CINFO}Diff against OR 1${CNORMAL}" "$(checkdiff $COMPAREFILE1 $COMPAREAGAINST)" \
                       "\n${CINFO}Diff against OR 2${CNORMAL}" "$(checkdiff $COMPAREFILE2 $COMPAREAGAINST)" &&
                  msgfail )
                ( 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

 }
 
 testshowvirtual() {
 }
 
 testshowvirtual() {

-       local VIRTUAL="N: Can't select versions from package '$1' as it purely virtual"
+       local VIRTUAL="N: Can't select versions from package '$1' as it is purely virtual"

        local PACKAGE="$1"
        shift
        while [ -n "$1" ]; do
                VIRTUAL="${VIRTUAL}
        local PACKAGE="$1"
        shift
        while [ -n "$1" ]; do
                VIRTUAL="${VIRTUAL}

-N: Can't select versions from package '$1' as it purely virtual"
+N: Can't select versions from package '$1' as it is purely virtual"

                PACKAGE="${PACKAGE} $1"
                shift
        done
                PACKAGE="${PACKAGE} $1"
                shift
        done


@@ -533,11 +607,11 @@ N: Can't select versions from package '$1' as it purely virtual"
        VIRTUAL="${VIRTUAL}
 N: No packages found"
        local COMPAREFILE=$(mktemp)
        VIRTUAL="${VIRTUAL}
 N: No packages found"
        local COMPAREFILE=$(mktemp)

+       addtrap "rm $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 -q=0 $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
        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 -q=0 $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail

-       rm $COMPAREFILE

 }
 
 testnopackage() {
 }
 
 testnopackage() {


@@ -554,8 +628,8 @@ testnopackage() {
 
 testdpkginstalled() {
        msgtest "Test for correctly installed package(s) with" "dpkg -l $*"
 
 testdpkginstalled() {
        msgtest "Test for correctly installed package(s) with" "dpkg -l $*"

-       local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^i]' | wc -l)"
-       if [ "$PKGS" != 0 ]; then
+       local PKGS="$(dpkg -l $* | grep '^i' | wc -l)"
+       if [ "$PKGS" != $# ]; then

                echo $PKGS
                dpkg -l $* | grep '^[a-z]'
                msgfail
                echo $PKGS
                dpkg -l $* | grep '^[a-z]'
                msgfail


@@ -564,9 +638,9 @@ testdpkginstalled() {
        msgpass
 }
 
        msgpass
 }
 

-testdpkgnoninstalled() {
-       msgtest "Test for correctly non-installed package(s) with" "dpkg -l $*"
-       local PKGS="$(dpkg -l $* | grep '^[a-z]' | grep '^[^u]' | wc -l)"
+testdpkgnotinstalled() {
+       msgtest "Test for correctly not-installed package(s) with" "dpkg -l $*"
+       local PKGS="$(dpkg -l $* 2> /dev/null | grep '^i' | wc -l)"

        if [ "$PKGS" != 0 ]; then
                echo
                dpkg -l $* | grep '^[a-z]'
        if [ "$PKGS" != 0 ]; then
                echo
                dpkg -l $* | grep '^[a-z]'


@@ -575,3 +649,16 @@ testdpkgnoninstalled() {
        fi
        msgpass
 }
        fi
        msgpass
 }

+
+testmarkedauto() {
+       local COMPAREFILE=$(mktemp)
+       addtrap "rm $COMPAREFILE;"
+       if [ -n "$1" ]; then
+               msgtest 'Test for correctly marked as auto-installed' "$*"
+               while [ -n "$1" ]; do echo "$1"; shift; done | sort > $COMPAREFILE
+       else
+               msgtest 'Test for correctly marked as auto-installed' 'no package'
+               echo > $COMPAREFILE
+       fi
+       aptmark showauto 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
+}