summaryrefslogtreecommitdiffstats
path: root/autotest.sh
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-05-15 13:16:16 +0200
committerLukas Reschke <lukas@owncloud.com>2015-05-15 13:16:16 +0200
commit89b0bc1915594256098461ad70ff75ea6f395a96 (patch)
tree58964d400ed03d0cf787aa866af3e807431c6534 /autotest.sh
parent8b0c223d6e55a7aeec03949bf01cbb89246960aa (diff)
downloadnextcloud-server-89b0bc1915594256098461ad70ff75ea6f395a96.tar.gz
nextcloud-server-89b0bc1915594256098461ad70ff75ea6f395a96.zip
Store in array to allow paths with whitespace
Diffstat (limited to 'autotest.sh')
-rwxr-xr-xautotest.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/autotest.sh b/autotest.sh
index d34bd48b49e..3ce88c64974 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -55,9 +55,9 @@ fi
# PHPUnit might also be installed via a facade binary script
if [[ "$PHPUNIT" =~ \.phar$ ]]; then
- PHPUNIT="$PHP $PHPUNIT"
+ PHPUNIT=( "$PHP" "$PHPUNIT" )
else
- PHPUNIT="$PHPUNIT"
+ PHPUNIT=( "$PHPUNIT" )
fi
PHPUNIT_VERSION=$($PHPUNIT --version | cut -d" " -f2)
@@ -167,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
- $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"
- $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
}