Fix autotest.sh execution

Signed-off-by: Joas Schilling <coding@schilljs.com>
pull/36497/head
Joas Schilling 1 year ago
parent bbd3e2b04a
commit 5d068ff534
No known key found for this signature in database
GPG Key ID: 74434EFE0D2E2205

@ -30,15 +30,15 @@ if [ -z "$PHP_EXE" ]; then
fi
PHP=$(which "$PHP_EXE")
if [ -z "$PHPUNIT_EXE" ]; then
if [ -f "build/integration/vendor/bin/phpunit" ]; then
PHPUNIT_EXE="./build/integration/vendor/bin/phpunit"
else
PHPUNIT_EXE=phpunit
fi
if [ -f build/integration/vendor/bin/phpunit ]; then
PHPUNIT_EXE="./build/integration/vendor/bin/phpunit"
PHPUNIT=$(readlink -f "$PHPUNIT_EXE")
else
PHPUNIT_EXE=phpunit
PHPUNIT=$(which "$PHPUNIT_EXE")
fi
fi
PHPUNIT=$(which "$PHPUNIT_EXE")
set -e
_XDEBUG_CONFIG=$XDEBUG_CONFIG
@ -400,8 +400,8 @@ function execute_tests {
echo "No coverage"
fi
echo "$PHP" "${PHPUNIT[@]}" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$2" "$3"
"$PHP" "${PHPUNIT[@]}" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$2" "$3"
echo "$PHPUNIT" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$2" "$3"
"$PHPUNIT" --configuration phpunit-autotest.xml $GROUP $COVER --log-junit "autotest-results-$DB.xml" "$2" "$3"
RESULT=$?
if [ "$PRIMARY_STORAGE_CONFIG" == "swift" ] ; then

Loading…
Cancel
Save