diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-08 10:15:28 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-08 10:15:28 +0100 |
| commit | fd356eadc6c3f840b2dae89c40eec458fde1ab4d (patch) | |
| tree | fd3b4f8cab083a059592e35bbf4f367433e381e5 | |
| parent | c93664468cf206f3fab7b7d77bcc911257a86d5e (diff) | |
| parent | 5cca471e82e1c77a0d3a831ffb5deb11f98f9640 (diff) | |
| download | nextcloud-server-fd356eadc6c3f840b2dae89c40eec458fde1ab4d.tar.gz nextcloud-server-fd356eadc6c3f840b2dae89c40eec458fde1ab4d.zip | |
Merge pull request #20951 from owncloud/Make_showing_logs_optional
Controlled arguments for run script
| -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 76c01068deb..5a222bda3e3 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 @@ -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 |