Merge pull request #20951 from owncloud/Make_showing_logs_optional

Controlled arguments for run script
This commit is contained in:
Thomas Müller 2015-12-08 10:15:28 +01:00
commit fd356eadc6

View file

@ -2,6 +2,9 @@
composer install
SCENARIO_TO_RUN=$1
HIDE_OC_LOGS=$2
# avoid port collision on jenkins - use $EXECUTOR_NUMBER
if [ -z "$EXECUTOR_NUMBER" ]; then
EXECUTOR_NUMBER=0
@ -21,13 +24,15 @@ echo $PHPPID_FED
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 $1
vendor/bin/behat -f junit -f pretty $SCENARIO_TO_RUN
RESULT=$?
kill $PHPPID
kill $PHPPID_FED
tail "../../data/owncloud.log"
if [ -z $HIDE_OC_LOGS ]; then
tail "../../data/owncloud.log"
fi
exit $RESULT