diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-05-15 11:44:51 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-05-15 11:57:40 +0200 |
| commit | 8b0c223d6e55a7aeec03949bf01cbb89246960aa (patch) | |
| tree | bbf6d34bd696a3a9da66736027b81bd268412bd0 /autotest.sh | |
| parent | e3ac4d7b370896c3b03baf188f059d229603e8de (diff) | |
| download | nextcloud-server-8b0c223d6e55a7aeec03949bf01cbb89246960aa.tar.gz nextcloud-server-8b0c223d6e55a7aeec03949bf01cbb89246960aa.zip | |
Add support for facade binary scripts
Fixes https://github.com/owncloud/core/issues/16296
Diffstat (limited to 'autotest.sh')
| -rwxr-xr-x | autotest.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/autotest.sh b/autotest.sh index b01bdda0896..d34bd48b49e 100755 --- a/autotest.sh +++ b/autotest.sh @@ -53,7 +53,14 @@ if ! [ -x "$PHPUNIT" ]; then exit 3 fi -PHPUNIT_VERSION=$("$PHP" "$PHPUNIT" --version | cut -d" " -f2) +# PHPUnit might also be installed via a facade binary script +if [[ "$PHPUNIT" =~ \.phar$ ]]; then + PHPUNIT="$PHP $PHPUNIT" +else + PHPUNIT="$PHPUNIT" +fi + +PHPUNIT_VERSION=$($PHPUNIT --version | cut -d" " -f2) PHPUNIT_MAJOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f1) PHPUNIT_MINOR_VERSION=$(echo "$PHPUNIT_VERSION" | cut -d"." -f2) @@ -160,11 +167,11 @@ function execute_tests { mkdir "coverage-html-$1" "$PHP" -f enable_all.php | grep -i -C9999 error && echo "Error during setup" && exit 101 if [ -z "$NOCOVERAGE" ]; then - "$PHP" "$PHPUNIT" --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" --coverage-clover "autotest-clover-$1.xml" --coverage-html "coverage-html-$1" "$2" "$3" + $PHPUNIT --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" --coverage-clover "autotest-clover-$1.xml" --coverage-html "coverage-html-$1" "$2" "$3" RESULT=$? else echo "No coverage" - "$PHP" "$PHPUNIT" --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" "$2" "$3" + $PHPUNIT --configuration phpunit-autotest.xml --log-junit "autotest-results-$1.xml" "$2" "$3" RESULT=$? fi } |