From e87c7403a6f1cedb3b5b5cb230f471b728313359 Mon Sep 17 00:00:00 2001 From: Eike Starkmann Date: Mon, 29 Jul 2024 16:55:44 +0200 Subject: [PATCH] [BUGFIX] Use correct path for functional and unit tests (#1375) --- Build/Scripts/runTests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh index e4d8647..9a9d491 100755 --- a/Build/Scripts/runTests.sh +++ b/Build/Scripts/runTests.sh @@ -527,7 +527,7 @@ case ${TEST_SUITE} in ;; functional) [ -z "${TEST_FILE}" ] && TEST_FILE="Tests/Functional" - COMMAND=".Build/bin/phpunit -c Configuration/FunctionalTests.xml --exclude-group not-${DBMS} ${EXTRA_TEST_OPTIONS} ${TEST_FILE}" + COMMAND=".Build/bin/phpunit -c Build/phpunit/FunctionalTests.xml --exclude-group not-${DBMS} ${EXTRA_TEST_OPTIONS} ${TEST_FILE}" case ${DBMS} in mariadb) echo "Using driver: ${DATABASE_DRIVER}" @@ -593,12 +593,12 @@ case ${TEST_SUITE} in ;; unit) [ -z "${TEST_FILE}" ] && TEST_FILE="Tests/Unit" - ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} .Build/bin/phpunit -c Configuration/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} + ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} .Build/bin/phpunit -c Build/phpunit/UnitTests.xml ${EXTRA_TEST_OPTIONS} ${TEST_FILE} SUITE_EXIT_CODE=$? ;; unitRandom) [ -z "${TEST_FILE}" ] && TEST_FILE="Tests/Unit" - ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-random-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} .Build/bin/phpunit -c Configuration/UnitTests.xml --order-by=random ${EXTRA_TEST_OPTIONS} ${PHPUNIT_RANDOM} ${TEST_FILE} + ${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-random-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} .Build/bin/phpunit -c Build/phpunit/UnitTests.xml --order-by=random ${EXTRA_TEST_OPTIONS} ${PHPUNIT_RANDOM} ${TEST_FILE} SUITE_EXIT_CODE=$? ;; update)