Pārlūkot izejas kodu

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

David Kalnischkies 14 gadi atpakaļ
vecāks
revīzija
3522b1a8f1
1 mainītis faili ar 9 papildinājumiem un 9 dzēšanām
  1. 9 9
      test/integration/framework

+ 9 - 9
test/integration/framework

@@ -688,30 +688,30 @@ signreleasefiles() {
 }
 
 changetowebserver() {
+	if [ -n "$1" ] && ! test -x ${BUILDDIRECTORY}/aptwebserver; then
+		msgdie 'Need the aptwebserver when passing arguments'
+	fi
 
-        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> /dev/null > /dev/null &
+		LD_LIBRARY_PATH=${BUILDDIRECTORY} ${BUILDDIRECTORY}/aptwebserver $@ 2> $LOG > $LOG &
 		addtrap "kill $!;"
 		cd - > /dev/null
 	elif which weborf > /dev/null; then
-		weborf -xb aptarchive/ 2>&1 > /dev/null &
+		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'