aboutsummaryrefslogtreecommitdiffstats
path: root/build/integration
diff options
context:
space:
mode:
Diffstat (limited to 'build/integration')
-rwxr-xr-xbuild/integration/run.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/build/integration/run.sh b/build/integration/run.sh
index bd2c2856ac7..9a2fe8e1895 100755
--- a/build/integration/run.sh
+++ b/build/integration/run.sh
@@ -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
+