improve test some more

[apt.git] / test / integration / framework

diff --git a/test/integration/framework b/test/integration/framework
index 2d6ada117c73abae12d28d28090a512e5c529d79..d15fd0e0105eedae9baa73da4bd77fc794fcb400 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -688,7 +688,17 @@ signreleasefiles() {
 }
 
 changetowebserver() {
-       if which weborf > /dev/null; then
+
+        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 &
+               addtrap "kill $!;"
+               cd - > /dev/null
+       elif which weborf > /dev/null; then
                weborf -xb aptarchive/ 2>&1 > /dev/null &
                addtrap "kill $!;"
        elif which gatling > /dev/null; then