Skip to content

Commit f1583c6

Browse files
committed
[TASK] Add not-core-<YX> exclude group for unit and functional tests
This change adds a new exclude group for the TYPO3 version used when executing `phpunit` for unit and functional tests like it is done for database vendor in functional tests already. That allows now to skip tests for specific core versions. Missing lower `MySQL` version in validation checks are added as a sidechange to ensure that supported version are selectable.
1 parent 0fbfe0b commit f1583c6

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

Build/Scripts/runTests.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ handleDbmsOptions() {
6363
exit 1
6464
fi
6565
[ -z "${DBMS_VERSION}" ] && DBMS_VERSION="8.0"
66-
if ! [[ ${DBMS_VERSION} =~ ^(8.0|8.1|8.2|8.3|8.4)$ ]]; then
66+
if ! [[ ${DBMS_VERSION} =~ ^(5.5|5.6|5.7|8.0|8.1|8.2|8.3|8.4)$ ]]; then
6767
echo "Invalid combination -d ${DBMS} -i ${DBMS_VERSION}" >&2
6868
echo >&2
6969
echo "Use \".Build/Scripts/runTests.sh -h\" to display help and valid options" >&2
@@ -561,7 +561,7 @@ case ${TEST_SUITE} in
561561
;;
562562
functional)
563563
PHPUNIT_CONFIG_FILE="Build/phpunit/FunctionalTestsCore${CORE_VERSION}.xml"
564-
COMMAND=(.Build/bin/phpunit -c ${PHPUNIT_CONFIG_FILE} --exclude-group not-${DBMS} "$@")
564+
COMMAND=(.Build/bin/phpunit -c ${PHPUNIT_CONFIG_FILE} --exclude-group not-${DBMS},not-core-${CORE_VERSION} "$@")
565565
case ${DBMS} in
566566
mariadb)
567567
echo "Using driver: ${DATABASE_DRIVER}"
@@ -623,13 +623,13 @@ case ${TEST_SUITE} in
623623
;;
624624
unit)
625625
PHPUNIT_CONFIG_FILE="Build/phpunit/UnitTestsCore${CORE_VERSION}.xml"
626-
COMMAND=(.Build/bin/phpunit -c ${PHPUNIT_CONFIG_FILE} "$@")
626+
COMMAND=(.Build/bin/phpunit -c ${PHPUNIT_CONFIG_FILE} --exclude-group not-core-${CORE_VERSION} "$@")
627627
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} "${COMMAND[@]}"
628628
SUITE_EXIT_CODE=$?
629629
;;
630630
unitRandom)
631631
PHPUNIT_CONFIG_FILE="Build/phpunit/UnitTestsCore${CORE_VERSION}.xml"
632-
COMMAND=(.Build/bin/phpunit -c ${PHPUNIT_CONFIG_FILE} --order-by=random ${PHPUNIT_RANDOM} "$@")
632+
COMMAND=(.Build/bin/phpunit -c ${PHPUNIT_CONFIG_FILE} --exclude-group not-core-${CORE_VERSION} --order-by=random ${PHPUNIT_RANDOM} "$@")
633633
${CONTAINER_BIN} run ${CONTAINER_COMMON_PARAMS} --name unit-random-${SUFFIX} ${XDEBUG_MODE} -e XDEBUG_CONFIG="${XDEBUG_CONFIG}" ${IMAGE_PHP} "${COMMAND[@]}"
634634
SUITE_EXIT_CODE=$?
635635
;;

0 commit comments

Comments
 (0)