merged the relevant bits from lp:~mvo/apt/lp346386

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index a514bef20e0f1b9cf26796a414af006e695605df..8f37d4a0337bd3c36989ab6a682f35640016a533 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -688,9 +688,13 @@ signreleasefiles() {
 }
 
 changetowebserver() {
+        if [ -n "$1" ] && ! test -x ${BUILDDIRECTORY}/aptwebserver; then
+            msgdie 'Need the aptwebserver when passing arguments'
+        fi
+
        if test -x ${BUILDDIRECTORY}/aptwebserver; then
                cd aptarchive
-               LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver 2> /dev/null > /dev/null &
+               LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver $@ 2> /dev/null > /dev/null &
                addtrap "kill $!;"
                cd - > /dev/null
        elif which weborf > /dev/null; then