File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -30,15 +30,15 @@ if [ -z "$PHP_EXE" ]; then
3030fi
3131PHP=$( which " $PHP_EXE " )
3232if [ -z " $PHPUNIT_EXE " ]; then
33- if [ -f " build/integration/vendor/bin/phpunit" ]; then
34- PHPUNIT_EXE=" ./build/integration/vendor/bin/phpunit"
35- else
36- PHPUNIT_EXE=phpunit
37- fi
33+ if [ -f build/integration/vendor/bin/phpunit ]; then
34+ PHPUNIT_EXE=" ./build/integration/vendor/bin/phpunit"
35+ PHPUNIT=$( readlink -f " $PHPUNIT_EXE " )
36+ else
37+ PHPUNIT_EXE=phpunit
38+ PHPUNIT=$( which " $PHPUNIT_EXE " )
39+ fi
3840fi
3941
40- PHPUNIT=$( which " $PHPUNIT_EXE " )
41-
4242set -e
4343
4444_XDEBUG_CONFIG=$XDEBUG_CONFIG
@@ -400,8 +400,8 @@ function execute_tests {
400400 echo " No coverage"
401401 fi
402402
403- echo " $PHP " " ${ PHPUNIT[@]} " --configuration phpunit-autotest.xml $GROUP $COVER --log-junit " autotest-results-$DB .xml" " $2 " " $3 "
404- " $PHP " " ${ PHPUNIT[@]} " --configuration phpunit-autotest.xml $GROUP $COVER --log-junit " autotest-results-$DB .xml" " $2 " " $3 "
403+ echo " $PHPUNIT " --configuration phpunit-autotest.xml $GROUP $COVER --log-junit " autotest-results-$DB .xml" " $2 " " $3 "
404+ " $PHPUNIT " --configuration phpunit-autotest.xml $GROUP $COVER --log-junit " autotest-results-$DB .xml" " $2 " " $3 "
405405 RESULT=$?
406406
407407 if [ " $PRIMARY_STORAGE_CONFIG " == " swift" ] ; then
You can’t perform that action at this time.
0 commit comments