do not hardcode /dev/null in changetowebserver so it can be changed

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index dba8c016236f542c04820658bfa92b3a94164e5a..965f984cab5b1f9d93237fd07d3a88142a591661 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -304,23 +304,28 @@ echo '$NAME says \"Hello!\"'" > ${BUILDDIR}/${NAME}
 Section: $SECTION
 Priority: $PRIORITY
 Maintainer: Joe Sixpack <joe@example.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3" > ${BUILDDIR}/debian/control
+       local BUILDDEPS="$(echo "$DEPENDENCIES" | grep '^Build-')"
+       test -z "$BUILDDEPS" || echo "$BUILDDEPS" >> ${BUILDDIR}/debian/control
+       echo "
+Package: $NAME" >> ${BUILDDIR}/debian/control
 
-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
+       local DEPS="$(echo "$DEPENDENCIES" | grep -v '^Build-')"
+       test -z "$DEPS" || echo "$DEPS" >> ${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
+               echo "Description: $DESCRIPTION" >> ${BUILDDIR}/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._+~-]*$')"
        for SRC in $SRCS; do
@@ -683,20 +688,30 @@ signreleasefiles() {
 }
 
 changetowebserver() {
-       if which weborf > /dev/null; then
-               weborf -xb aptarchive/ 2>&1 > /dev/null &
+       if [ -n "$1" ] && ! test -x ${BUILDDIRECTORY}/aptwebserver; then
+               msgdie 'Need the aptwebserver when passing arguments'
+       fi
+
+       local LOG='/dev/null'
+       if test -x ${BUILDDIRECTORY}/aptwebserver; then
+               cd aptarchive
+               LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver $@ 2> $LOG > $LOG &
+               addtrap "kill $!;"
+               cd - > /dev/null
+       elif which weborf > /dev/null; then
+               weborf -xb aptarchive/ 2> $LOG > $LOG &
                addtrap "kill $!;"
        elif which gatling > /dev/null; then
                cd aptarchive
-               gatling -p 8080 -F -S 2>&1 > /dev/null &
+               gatling -p 8080 -F -S 2> $LOG > $LOG &
                addtrap "kill $!;"
                cd - > /dev/null
        elif which lighttpd > /dev/null; then
                echo "server.document-root = \"$(readlink -f ./aptarchive)\"
 server.port = 8080
 server.stat-cache-engine = \"disable\"" > lighttpd.conf
-               lighttpd -t -f lighttpd.conf >/dev/null || msgdie 'Can not change to webserver: our lighttpd config is invalid'
-               lighttpd -D -f lighttpd.conf 2>/dev/null >/dev/null &
+               lighttpd -t -f lighttpd.conf 2> $LOG > $LOG || msgdie 'Can not change to webserver: our lighttpd config is invalid'
+               lighttpd -D -f lighttpd.conf 2> $LOG > $LOG &
                addtrap "kill $!;"
        else
                msgdie 'You have to install weborf or lighttpd first'