test/integration/framework: use EXIT_CODE to be consistent with the run-tests code

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 2d6ada117c73abae12d28d28090a512e5c529d79..4a70573c89eeafca8e75159b05e7c32e26eb2d7a 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1,5 +1,7 @@
 #!/bin/sh -- # no runable script, just for vi
 
 #!/bin/sh -- # no runable script, just for vi
 

+EXIT_CODE=0
+

 # we all like colorful messages
 if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null && \
    expr match "$(readlink -f /proc/$$/fd/2)" '/dev/pts/[0-9]\+' > /dev/null; then
 # we all like colorful messages
 if expr match "$(readlink -f /proc/$$/fd/1)" '/dev/pts/[0-9]\+' > /dev/null && \
    expr match "$(readlink -f /proc/$$/fd/2)" '/dev/pts/[0-9]\+' > /dev/null; then


@@ -36,7 +38,7 @@ msgtest() {
 }
 msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; }
 msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; }
 }
 msgpass() { echo "${CPASS}PASS${CNORMAL}" >&2; }
 msgskip() { echo "${CWARNING}SKIP${CNORMAL}" >&2; }

-msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; }
+msgfail() { echo "${CFAIL}FAIL${CNORMAL}" >&2; EXIT_CODE=$((EXIT_CODE+1)); }

 
 # enable / disable Debugging
 MSGLEVEL=${MSGLEVEL:-3}
 
 # enable / disable Debugging
 MSGLEVEL=${MSGLEVEL:-3}


@@ -91,6 +93,7 @@ runapt() {
 }
 aptconfig() { runapt apt-config $*; }
 aptcache() { runapt apt-cache $*; }
 }
 aptconfig() { runapt apt-config $*; }
 aptcache() { runapt apt-cache $*; }

+aptcdrom() { runapt apt-cdrom $*; }

 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
 aptkey() { runapt apt-key $*; }
 aptget() { runapt apt-get $*; }
 aptftparchive() { runapt apt-ftparchive $*; }
 aptkey() { runapt apt-key $*; }


@@ -112,9 +115,18 @@ gdb() {
        APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which gdb) ${BUILDDIRECTORY}/$1
 }
 
        APT_CONFIG=aptconfig.conf LD_LIBRARY_PATH=${BUILDDIRECTORY} $(which gdb) ${BUILDDIRECTORY}/$1
 }
 

+exitwithstatus() {
+        # error if we about to overflow, but ...
+        #   "255 failures ought to be enough for everybody"
+        if [ $EXIT_CODE -gt 255 ]; then
+            msgdie "Total failure count $EXIT_CODE too big"
+        fi
+        exit $((EXIT_CODE <= 255 ? EXIT_CODE : 255));
+}
+

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

-       trap "$CURRENTTRAP exit;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM
+       trap "$CURRENTTRAP exitwithstatus;" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM

 }
 
 setupenvironment() {
 }
 
 setupenvironment() {


@@ -467,7 +479,7 @@ insertpackage() {
        local PRIORITY="${6:-optional}"
        local ARCHS=""
        for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
        local PRIORITY="${6:-optional}"
        local ARCHS=""
        for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do

-               if [ "$arch" = "all" ]; then
+               if [ "$arch" = 'all' -o "$arch" = 'none' ]; then

                        ARCHS="$(getarchitectures)"
                else
                        ARCHS="$arch"
                        ARCHS="$(getarchitectures)"
                else
                        ARCHS="$arch"


@@ -481,9 +493,9 @@ insertpackage() {
 Priority: $PRIORITY
 Section: other
 Installed-Size: 42
 Priority: $PRIORITY
 Section: other
 Installed-Size: 42

-Maintainer: Joe Sixpack <joe@example.org>
-Architecture: $arch
-Version: $VERSION
+Maintainer: Joe Sixpack <joe@example.org>" >> $FILE
+                       test "$arch" = 'none' || echo "Architecture: $arch" >> $FILE
+                       echo "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}
 Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" >> $FILE
                        test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
                        echo "Description: an autogenerated dummy ${NAME}=${VERSION}/${RELEASE}


@@ -523,17 +535,18 @@ insertinstalledpackage() {
        local VERSION="$3"
        local DEPENDENCIES="$4"
        local PRIORITY="${5:-optional}"
        local VERSION="$3"
        local DEPENDENCIES="$4"
        local PRIORITY="${5:-optional}"

+       local STATUS="${6:-install ok installed}"

        local FILE='rootdir/var/lib/dpkg/status'
        local INFO='rootdir/var/lib/dpkg/info'
        for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
                echo "Package: $NAME
        local FILE='rootdir/var/lib/dpkg/status'
        local INFO='rootdir/var/lib/dpkg/info'
        for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do
                echo "Package: $NAME

-Status: install ok installed
+Status: $STATUS

 Priority: $PRIORITY
 Section: other
 Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>
 Priority: $PRIORITY
 Section: other
 Installed-Size: 42
 Maintainer: Joe Sixpack <joe@example.org>

-Architecture: $arch

 Version: $VERSION" >> $FILE
 Version: $VERSION" >> $FILE

+               test "$arch" = 'none' || echo "Architecture: $arch" >> $FILE

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


@@ -714,6 +727,21 @@ server.stat-cache-engine = \"disable\"" > lighttpd.conf
        return 0
 }
 
        return 0
 }
 

+changetocdrom() {
+       mkdir -p rootdir/media/cdrom/.disk
+       local CD="$(readlink -f rootdir/media/cdrom)"
+       echo "acquire::cdrom::mount \"${CD}\";" > rootdir/etc/apt/apt.conf.d/00cdrom
+       echo 'acquire::cdrom::autodetect 0;' >> rootdir/etc/apt/apt.conf.d/00cdrom
+       echo -n "$1" > ${CD}/.disk/info
+       if [ ! -d aptarchive/dists ]; then
+               msgdie 'Flat file archive cdroms can not be created currently'
+               return 1
+       fi
+       mv aptarchive/dists $CD
+       ln -s "$(readlink -f ./incoming)" $CD/pool
+       find rootdir/etc/apt/sources.list.d/ -name 'apt-test-*.list' -delete
+}
+

 checkdiff() {
        local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
        if [ -n "$DIFFTEXT" ]; then
 checkdiff() {
        local DIFFTEXT="$($(which diff) -u $* | sed -e '/^---/ d' -e '/^+++/ d' -e '/^@@/ d')"
        if [ -n "$DIFFTEXT" ]; then


@@ -736,6 +764,11 @@ testfileequal() {
        fi
 }
 
        fi
 }
 

+testempty() {
+       msgtest "Test for no output of" "$*"
+       test -z "$($* 2>&1)" && msgpass || msgfail
+}
+

 testequal() {
        local COMPAREFILE=$(mktemp)
        addtrap "rm $COMPAREFILE;"
 testequal() {
        local COMPAREFILE=$(mktemp)
        addtrap "rm $COMPAREFILE;"


@@ -796,7 +829,7 @@ 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 '^i' | wc -l)"
+       local PKGS="$(dpkg -l $* 2>/dev/null | grep '^i' | wc -l)"

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