run integration tests on my new amd64 box without failures

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 702e352a309d071b5ddc4dd5c05cfefe00c31eda..b55f793a4860b3590ca8d717a7222c86814a89cd 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -1,16 +1,19 @@
 #!/bin/sh -- # no runable script, just for vi
 
 # we all like colorful messages
 #!/bin/sh -- # no runable script, just for vi
 
 # we all like colorful messages

-CERROR="\e[1;31m" # red
-CWARNING="\e[1;33m" # yellow
-CMSG="\e[1;32m" # green
-CINFO="\e[1;96m" # light blue
-CDEBUG="\e[1;94m" # blue
-CNORMAL="\e[0;39m" # default system console color
-CDONE="\e[1;32m" # green
-CPASS="\e[1;32m" # green
-CFAIL="\e[1;31m" # red
-CCMD="\e[1;35m" # pink
+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
+       CERROR="\e[1;31m" # red
+       CWARNING="\e[1;33m" # yellow
+       CMSG="\e[1;32m" # green
+       CINFO="\e[1;96m" # light blue
+       CDEBUG="\e[1;94m" # blue
+       CNORMAL="\e[0;39m" # default system console color
+       CDONE="\e[1;32m" # green
+       CPASS="\e[1;32m" # green
+       CFAIL="\e[1;31m" # red
+       CCMD="\e[1;35m" # pink
+fi

 
 msgdie() { echo "${CERROR}E: $1${CNORMAL}" >&2; exit 1; }
 msgwarn() { echo "${CWARNING}W: $1${CNORMAL}" >&2; }
 
 msgdie() { echo "${CERROR}E: $1${CNORMAL}" >&2; exit 1; }
 msgwarn() { echo "${CWARNING}W: $1${CNORMAL}" >&2; }


@@ -42,7 +45,11 @@ if [ $MSGLEVEL -le 2 ]; then
        msgtest() { true; }
        msgpass() { echo -n " ${CPASS}P${CNORMAL}" >&2; }
        msgskip() { echo -n " ${CWARNING}S${CNORMAL}" >&2; }
        msgtest() { true; }
        msgpass() { echo -n " ${CPASS}P${CNORMAL}" >&2; }
        msgskip() { echo -n " ${CWARNING}S${CNORMAL}" >&2; }

-       msgfail() { echo -n " ${CFAIL}FAIL${CNORMAL}" >&2; }
+       if [ -n "$CFAIL" ]; then
+               msgfail() { echo -n " ${CFAIL}FAIL${CNORMAL}" >&2; }
+       else
+               msgfail() { echo -n " ###FAILED###" >&2; }
+       fi

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


@@ -142,6 +149,7 @@ setupenvironment() {
        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:: \"--root=${TMPWORKINGDIRECTORY}/rootdir\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-not-root\";" >> aptconfig.conf
        echo "DPKG::options:: \"--force-bad-path\";" >> aptconfig.conf

+       echo "DPKG::options:: \"--force-architecture\";" >> aptconfig.conf # Added to test multiarch before dpkg is ready for it…

        echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
        echo 'quiet::NoUpdate "true";' >> aptconfig.conf
        export LC_ALL=C
        echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf
        echo 'quiet::NoUpdate "true";' >> aptconfig.conf
        export LC_ALL=C


@@ -149,12 +157,26 @@ setupenvironment() {
        msgdone "info"
 }
 
        msgdone "info"
 }
 

+getarchitecture() {
+       if [ "$1" = "native" -o -z "$1" ]; then
+               eval `aptconfig shell ARCH APT::Architecture`
+               if [ -n "$ARCH" ]; then
+                       echo $ARCH
+               else
+                       dpkg-architecture -qDEB_BUILD_ARCH
+               fi
+       else
+               echo $1
+       fi
+}
+

 configarchitecture() {
        local CONFFILE=rootdir/etc/apt/apt.conf.d/01multiarch.conf
 configarchitecture() {
        local CONFFILE=rootdir/etc/apt/apt.conf.d/01multiarch.conf

-       echo "APT::Architecture \"$1\";" > $CONFFILE
+       rm -f $CONFFILE
+       echo "APT::Architecture \"$(getarchitecture $1)\";" > $CONFFILE

        shift
        while [ -n "$1" ]; do
        shift
        while [ -n "$1" ]; do

-               echo "APT::Architectures:: \"$1\";" >> $CONFFILE
+               echo "APT::Architectures:: \"$(getarchitecture $1)\";" >> $CONFFILE

                shift
        done
 }
                shift
        done
 }


@@ -267,7 +289,7 @@ Package: $NAME" > ${BUILDDIR}/debian/control
                echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist
        done
 
                echo "pool/${SRC}" >> ${BUILDDIR}/../${RELEASE}.${DISTSECTION}.srclist
        done
 

-       for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+       for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do

                rm -rf ${BUILDDIR}/debian/tmp
                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}
                rm -rf ${BUILDDIR}/debian/tmp
                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}


@@ -290,6 +312,7 @@ buildpackage() {
        local BUILDDIR=$1
        local RELEASE=$2
        local SECTION=$3
        local BUILDDIR=$1
        local RELEASE=$2
        local SECTION=$3

+       local ARCH=$(getarchitecture $4)

        msgninfo "Build package $(echo "$BUILDDIR" | grep -o '[^/]*$') for ${RELEASE} in ${SECTION}… "
        cd $BUILDDIR
        if [ "$ARCH" = "all" ]; then
        msgninfo "Build package $(echo "$BUILDDIR" | grep -o '[^/]*$') for ${RELEASE} in ${SECTION}… "
        cd $BUILDDIR
        if [ "$ARCH" = "all" ]; then


@@ -400,7 +423,7 @@ insertpackage() {
        local DEPENDENCIES="$5"
        local PRIORITY="${6:-optional}"
        local ARCHS=""
        local DEPENDENCIES="$5"
        local PRIORITY="${6:-optional}"
        local ARCHS=""

-       for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+       for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do

                if [ "$arch" = "all" ]; then
                        ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
                else
                if [ "$arch" = "all" ]; then
                        ARCHS="$(aptconfig dump | grep APT::Architecture | cut -d'"' -f 2 | sed '/^$/ d' | sort | uniq | tr '\n' ' ')"
                else


@@ -429,6 +452,27 @@ Filename: pool/main/${NAME}/${NAME}_${VERSION}_${arch}.deb" >> $FILE
        done
 }
 
        done
 }
 

+insertsource() {
+       local RELEASE="$1"
+       local NAME="$2"
+       local ARCH="$3"
+       local VERSION="$4"
+       local DEPENDENCIES="$5"
+       local ARCHS=""
+       local SPATH="aptarchive/dists/${RELEASE}/main/source"
+       mkdir -p $SPATH
+       local FILE="${SPATH}/Sources"
+       echo "Package: $NAME
+Binary: $NAME
+Version: $VERSION
+Maintainer: Joe Sixpack <joe@example.org>
+Architecture: $ARCH" >> $FILE
+       test -z "$DEPENDENCIES" || echo "$DEPENDENCIES" >> $FILE
+       echo "Files:
+ d41d8cd98f00b204e9800998ecf8427e 0 ${NAME}_${VERSION}.dsc
+ d41d8cd98f00b204e9800998ecf8427e 0 ${NAME}_${VERSION}.tar.gz" >> $FILE
+}
+

 insertinstalledpackage() {
        local NAME="$1"
        local ARCH="$2"
 insertinstalledpackage() {
        local NAME="$1"
        local ARCH="$2"


@@ -436,7 +480,7 @@ insertinstalledpackage() {
        local DEPENDENCIES="$4"
        local PRIORITY="${5:-optional}"
        local FILE="rootdir/var/lib/dpkg/status"
        local DEPENDENCIES="$4"
        local PRIORITY="${5:-optional}"
        local FILE="rootdir/var/lib/dpkg/status"

-       for arch in $(echo "$ARCH" | sed -e 's#,#\n#g'); do
+       for arch in $(echo "$ARCH" | sed -e 's#,#\n#g' | sed -e "s#^native\$#$(getarchitecture 'native')#"); do

                echo "Package: $NAME
 Status: install ok installed
 Priority: $PRIORITY
                echo "Package: $NAME
 Status: install ok installed
 Priority: $PRIORITY


@@ -484,10 +528,12 @@ buildaptarchivefromfiles() {
 # can be overridden by testcases for their pleasure
 getcodenamefromsuite() { echo -n "$1"; }
 getreleaseversionfromsuite() { true; }
 # can be overridden by testcases for their pleasure
 getcodenamefromsuite() { echo -n "$1"; }
 getreleaseversionfromsuite() { true; }

+getlabelfromsuite() { true; }

 
 generatereleasefiles() {
 
 generatereleasefiles() {

+       # $1 is the Date header and $2 is the ValidUntil header to be set
+       # both should be given in notation date/touch can understand

        msgninfo "\tGenerate Release files… "
        msgninfo "\tGenerate Release files… "

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

        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
        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


@@ -496,27 +542,35 @@ generatereleasefiles() {
                        local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
                        local CODENAME="$(getcodenamefromsuite $SUITE)"
                        local VERSION="$(getreleaseversionfromsuite $SUITE)"
                        local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
                        local CODENAME="$(getcodenamefromsuite $SUITE)"
                        local VERSION="$(getreleaseversionfromsuite $SUITE)"

-                       if [ -z "$VERSION" ]; then
-                               aptftparchive -qq release $dir \
-                                       -o APT::FTPArchive::Release::Suite="${SUITE}" \
-                                       -o APT::FTPArchive::Release::Codename="${CODENAME}" \
-                                               | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
-                       else
-                               aptftparchive -qq release $dir \
-                                       -o APT::FTPArchive::Release::Suite="${SUITE}" \
-                                       -o APT::FTPArchive::Release::Codename="${CODENAME}" \
-                                       -o APT::FTPArchive::Release::Version="${VERSION}" \
-                                               | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference
+                       local LABEL="$(getlabelfromsuite $SUITE)"
+                       if [ -n "$VERSION" ]; then
+                               VERSION="-o APT::FTPArchive::Release::Version=${VERSION}"
+                       fi
+                       if [ -n "$LABEL" ]; then
+                               LABEL="-o APT::FTPArchive::Release::Label=${LABEL}"

                        fi
                        fi

+                       aptftparchive -qq release $dir \
+                               -o APT::FTPArchive::Release::Suite="${SUITE}" \
+                               -o APT::FTPArchive::Release::Codename="${CODENAME}" \
+                               ${LABEL} \
+                               ${VERSION} \
+                                       | sed -e '/0 Release$/ d' > $dir/Release # remove the self reference

                        if [ "$SUITE" = "experimental" -o "$SUITE" = "experimental2" ]; then
                                sed -i '/^Date: / a\
 NotAutomatic: yes' $dir/Release
                        fi
                        if [ "$SUITE" = "experimental" -o "$SUITE" = "experimental2" ]; then
                                sed -i '/^Date: / a\
 NotAutomatic: yes' $dir/Release
                        fi

+                       if [ -n "$1" -a "$1" != "now" ]; then
+                               sed -i "s/^Date: .*$/Date: $(date -d "$1" '+%a, %d %b %Y %H:%M:%S %Z')/" $dir/Release
+                       fi
+                       if [ -n "$2" ]; then
+                               sed -i "/^Date: / a\
+Valid-Until: $(date -d "$2" '+%a, %d %b %Y %H:%M:%S %Z')" $dir/Release
+                       fi

                done
        else
                aptftparchive -qq release ./aptarchive | sed -e '/0 Release$/ d' > aptarchive/Release # remove the self reference
        fi
                done
        else
                aptftparchive -qq release ./aptarchive | sed -e '/0 Release$/ d' > aptarchive/Release # remove the self reference
        fi

-       if [ "$DATE" != "now" ]; then
+       if [ -n "$1" -a "$1" != "now" ]; then

                for release in $(find ./aptarchive -name 'Release'); do
                        touch -d "$1" $release
                done
                for release in $(find ./aptarchive -name 'Release'); do
                        touch -d "$1" $release
                done


@@ -590,6 +644,11 @@ changetowebserver() {
        if which weborf > /dev/null; then
                weborf -xb aptarchive/ 2>&1 > /dev/null &
                addtrap "kill $!;"
        if which weborf > /dev/null; then
                weborf -xb aptarchive/ 2>&1 > /dev/null &
                addtrap "kill $!;"

+       elif which gatling > /dev/null; then
+               cd aptarchive
+               gatling -p 8080 -F -S 2>&1 > /dev/null &
+               addtrap "kill $!;"
+               cd - > /dev/null

        elif which lighttpd > /dev/null; then
                echo "server.document-root = \"$(readlink -f ./aptarchive)\"
 server.port = 8080
        elif which lighttpd > /dev/null; then
                echo "server.document-root = \"$(readlink -f ./aptarchive)\"
 server.port = 8080


@@ -671,8 +730,7 @@ N: Can't select versions from package '$1' as it is purely virtual"
 N: No packages found"
        local COMPAREFILE=$(mktemp)
        addtrap "rm $COMPAREFILE;"
 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`
+       local ARCH="$(getarchitecture 'native')"

        echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE
        aptcache show -q=0 $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
 }
        echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' > $COMPAREFILE
        aptcache show -q=0 $PACKAGE 2>&1 | checkdiff $COMPAREFILE - && msgpass || msgfail
 }