From 89b0bc1915594256098461ad70ff75ea6f395a96 Mon Sep 17 00:00:00 2001 From: Lukas Reschke Date: Fri, 15 May 2015 13:16:16 +0200 Subject: Store in array to allow paths with whitespace --- autotest.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'autotest.sh') 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 } -- cgit v1.2.3