From 48a91164e5e63e3c1ef2c14b54337dbf19ed7d04 Mon Sep 17 00:00:00 2001 From: Sergio Bertolin Date: Fri, 4 Dec 2015 12:43:08 +0000 Subject: Controlled arguments for run script --- build/integration/run.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build/integration/run.sh b/build/integration/run.sh index 76c01068deb..23f71f83ff3 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -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 @@ -27,7 +30,9 @@ RESULT=$? kill $PHPPID kill $PHPPID_FED -tail "../../data/owncloud.log" +if [ -z $HIDE_OC_LOGS ]; then + tail "../../data/owncloud.log" +fi exit $RESULT -- cgit v1.2.3 From 5cca471e82e1c77a0d3a831ffb5deb11f98f9640 Mon Sep 17 00:00:00 2001 From: Sergio Bertolin Date: Fri, 4 Dec 2015 12:53:11 +0000 Subject: forgotten variable --- build/integration/run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/integration/run.sh b/build/integration/run.sh index 23f71f83ff3..5a222bda3e3 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -24,7 +24,7 @@ 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 -- cgit v1.2.3