summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2013-07-01 10:48:58 +0200
committerBjörn Schießle <schiessle@owncloud.com>2013-07-01 10:48:58 +0200
commit7b0e3e6303c50648950786c5310089b8a5911c21 (patch)
tree24020ac9a827c579731b3ee69548d40060c546a9
parentd8b3aee24eddcc66d1be1920bfb80f66491cc8e3 (diff)
parent180faa24a16f210fa1181844d8aa7eeb6d5dac72 (diff)
downloadnextcloud-server-7b0e3e6303c50648950786c5310089b8a5911c21.tar.gz
nextcloud-server-7b0e3e6303c50648950786c5310089b8a5911c21.zip
Merge branch 'master' of github.com:owncloud/core
-rwxr-xr-xautotest.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/autotest.sh b/autotest.sh
index 4562b3ed08a..59f0240d99b 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -132,9 +132,9 @@ EOF
php -f enable_all.php
if [ "$1" == "sqlite" ] ; then
# coverage only with sqlite - causes segfault on ci.tmit.eu - reason unknown
- phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1
+ phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml --coverage-clover autotest-clover-$1.xml --coverage-html coverage-html-$1 $2 $3
else
- phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml
+ phpunit --configuration phpunit-autotest.xml --log-junit autotest-results-$1.xml $2 $3
fi
}
@@ -149,7 +149,7 @@ if [ -z "$1" ]
# we will add oci as soon as it's stable
#execute_tests 'oci'
else
- execute_tests $1
+ execute_tests $1 $2 $3
fi
#