Merge branch 'master' of github.com:owncloud/core

This commit is contained in:
Björn Schießle 2013-07-01 10:48:58 +02:00
commit 7b0e3e6303
1 changed files with 3 additions and 3 deletions

View File

@ -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
#