瀏覽代碼

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
David Kalnischkies 12 年之前
父節點
當前提交
bee0670b2d
共有 1 個文件被更改,包括 6 次插入2 次删除
  1. 6 2
      test/integration/framework

+ 6 - 2
test/integration/framework

@@ -835,10 +835,14 @@ changetowebserver() {
 	else
 	else
 		shift
 		shift
 	fi
 	fi
-	local LOG='/dev/null'
 	if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then
 	if test -x ${APTWEBSERVERBINDIR}/aptwebserver; then
 		cd aptarchive
 		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)"
 		local PID="$(cat aptwebserver.pid)"
 		if [ -z "$PID" ]; then
 		if [ -z "$PID" ]; then
 			msgdie 'Could not fork aptwebserver successfully'
 			msgdie 'Could not fork aptwebserver successfully'