diff --git a/.ci/travis/linux/docker-build-test.sh b/.ci/travis/linux/docker-build-test.sh index c54e69c8dfa..db0ae411a7d 100755 --- a/.ci/travis/linux/docker-build-test.sh +++ b/.ci/travis/linux/docker-build-test.sh @@ -38,7 +38,7 @@ cmake \ export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so -export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k" +export CTEST_BUILD_COMMAND=ninja python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "$(cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure diff --git a/.ci/travis/travis.ctest b/.ci/travis/travis.ctest index bd2e8a89806..41de33c7bf8 100644 --- a/.ci/travis/travis.ctest +++ b/.ci/travis/travis.ctest @@ -1,5 +1,5 @@ -SET (CTEST_SOURCE_DIRECTORY /root/QGIS/build-docker) -SET (CTEST_BINARY_DIRECTORY /root/QGIS) +SET (CTEST_SOURCE_DIRECTORY $ENV{TRAVIS_BUILD_DIR}) +SET (CTEST_BINARY_DIRECTORY $ENV{TRAVIS_BUILD_DIR}/build-docker) #SET (CTEST_SOURCE_DIRECTORY /usr/src/QGIS) #SET (CTEST_BINARY_DIRECTORY /usr/src/qgis-build) diff --git a/.docker/docker-compose.travis.yml b/.docker/docker-compose.travis.yml index b8678779efe..17938b63800 100644 --- a/.docker/docker-compose.travis.yml +++ b/.docker/docker-compose.travis.yml @@ -13,7 +13,7 @@ services: - postgres environment: - CCACHE_DIR=/root/.ccache - - TRAVIS_BUILD_DIR=${TRAVIS_BUILD_DIR} + - TRAVIS_BUILD_DIR=/root/QGIS - TRAVIS_BRANCH=${TRAVIS_BRANCH} - TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST} - TRAVIS_PULL_REQUEST_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH}