diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-01 09:24:40 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-01 10:16:46 +0100 |
| commit | 21e063a9e7e4bb8f5beb808389eb888641b3f84f (patch) | |
| tree | adc8283de6c6dd21a5f9e39b3b26984d2851ae5c | |
| parent | 8a1e6c0ad98072803d4fe0b374fbfe1844fa139e (diff) | |
| download | nextcloud-server-21e063a9e7e4bb8f5beb808389eb888641b3f84f.tar.gz nextcloud-server-21e063a9e7e4bb8f5beb808389eb888641b3f84f.zip | |
tail the server log and exit with the exit code of behat
| -rwxr-xr-x | build/integration/run.sh | 9 |
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 + |