diff --git a/Build/Scripts/runTests.sh b/Build/Scripts/runTests.sh index 1fc57c9a288157fcb3e20130951e00b99a452688..691c45dbe33dce4c58ec66b50b5a386a2e5618a5 100755 --- a/Build/Scripts/runTests.sh +++ b/Build/Scripts/runTests.sh @@ -566,7 +566,7 @@ case ${TEST_SUITE} in functional) handleDbmsAndDriverOptions setUpDockerComposeDotEnv - if [ "${CHUNKS}" -gt 1 ]; then + if [ "${CHUNKS}" -gt 0 ]; then docker-compose run functional_split fi case ${DBMS} in diff --git a/Build/testing-docker/local/docker-compose.yml b/Build/testing-docker/local/docker-compose.yml index 047e6ffe7292bd50c418ecaf526ba3a0ef1c967b..dfa9f3e06ff6d5ed07e37d72aee353adc4c94e16 100644 --- a/Build/testing-docker/local/docker-compose.yml +++ b/Build/testing-docker/local/docker-compose.yml @@ -712,7 +712,11 @@ services: volumes: - ${CORE_ROOT}:${CORE_ROOT} working_dir: ${CORE_ROOT} - command: php -dxdebug.mode=off Build/Scripts/splitFunctionalTests.php -v ${CHUNKS} + command: > + /bin/sh -c " + rm -rf Build/FunctionalTests-Job-*.xml + php -dxdebug.mode=off Build/Scripts/splitFunctionalTests.php -v ${CHUNKS} + " prepare_functional_mariadb: image: alpine:3.8