summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-01-16 17:21:13 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2014-01-16 17:21:13 +0100
commitbee0670b2dc8c50ddfc65731c00383da4d377cae (patch)
treec54c0abdbb39c8e002fd459b16d7e1edd54684cd
parentc5909dcfdc65ce8120d641227976ba4597fd3e70 (diff)
show the error message if the webserver start failed
Can happen e.g. if port 8080 is already used by something else Git-Dch: Ignore
-rw-r--r--test/integration/framework8
1 files changed, 6 insertions, 2 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 60a8167fa..c4953812b 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -835,10 +835,14 @@ changetowebserver() {
else
shift
fi
- local LOG='/dev/null'
if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then
cd aptarchive
- aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1
+ local LOG="$(mktemp)"
+ addtrap "rm $LOG;"
+ if ! aptwebserver -o aptwebserver::fork=1 "$@" >$LOG 2>&1 ; then
+ cat $LOG
+ false
+ fi
local PID="$(cat aptwebserver.pid)"
if [ -z "$PID" ]; then
msgdie 'Could not fork aptwebserver successfully'