]> source.dussan.org Git - nextcloud-server.git/commitdiff
tail the server log and exit with the exit code of behat
authorThomas Müller <thomas.mueller@tmit.eu>
Tue, 1 Dec 2015 08:24:40 +0000 (09:24 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Tue, 1 Dec 2015 09:16:46 +0000 (10:16 +0100)
build/integration/run.sh

index bd2c2856ac74abb35403c5eb370d515fecaec7ea..9a2fe8e18950581fad0e9219d935713a7a4a6931 100755 (executable)
@@ -2,12 +2,11 @@
 
 composer install
 
-# TODO: avoid port collision on jenkins - use $EXECUTOR_NUMBER
+# avoid port collision on jenkins - use $EXECUTOR_NUMBER
 if [ -z "$EXECUTOR_NUMBER" ]; then
     EXECUTOR_NUMBER=0
 fi
 PORT=$((8080 + $EXECUTOR_NUMBER))
-#PORT=8080
 echo $PORT
 php -S localhost:$PORT -t ../.. &
 PHPPID=$!
@@ -23,6 +22,12 @@ export TEST_SERVER_URL="http://localhost:$PORT/ocs/"
 export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/"
 
 vendor/bin/behat -f junit -f pretty
+RESULT=$?
 
 kill $PHPPID
 kill $PHPPID_FED
+
+tail "../../data/owncloud.log"
+
+exit $RESULT
+