diff options
| author | Joas Schilling <coding@schilljs.com> | 2023-02-02 11:58:55 +0100 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2023-02-02 11:58:55 +0100 |
| commit | 5d068ff5341b7af8c08c97fb77d90741c2f5f1e0 (patch) | |
| tree | fba58c5fc0e4835366d5959020db8962f4a4bd9e /autotest.sh | |
| parent | bbd3e2b04a8a882400fc5034126b3405f80605f8 (diff) | |
| download | nextcloud-server-5d068ff5341b7af8c08c97fb77d90741c2f5f1e0.tar.gz nextcloud-server-5d068ff5341b7af8c08c97fb77d90741c2f5f1e0.zip | |
Fix autotest.sh execution
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'autotest.sh')
| -rwxr-xr-x | autotest.sh | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/autotest.sh b/autotest.sh index 84ffa0a1c78..09b983bbfa2 100755 --- a/autotest.sh +++ b/autotest.sh @@ -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 |