File tree Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Expand file tree Collapse file tree 3 files changed +4
-3
lines changed Original file line number Diff line number Diff line change @@ -30,6 +30,7 @@ ccache -z
3030TIMEOUT=$( expr 40 \* 60 - ` date +%s` + ` cat /tmp/travis_timestamp` )
3131
3232export CTEST_BUILD_COMMAND=/usr/local/bin/ninja
33+ export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR}
3334
3435gtimeout ${TIMEOUT} s ctest -V -E " $( cat ${DIR} /blacklist.txt | gsed -r ' /^(#.*?)?$/d' | gpaste -sd ' |' -) " -S ${DIR} /../travis.ctest --output-on-failure
3536
Original file line number Diff line number Diff line change 1- SET (CTEST_SOURCE_DIRECTORY $ENV{TRAVIS_BUILD_DIR })
2- SET (CTEST_BINARY_DIRECTORY $ENV{TRAVIS_BUILD_DIR }/build-docker)
1+ SET (CTEST_SOURCE_DIRECTORY $ENV{CTEST_BUILD_DIR })
2+ SET (CTEST_BINARY_DIRECTORY $ENV{CTEST_BUILD_DIR }/build-docker)
33#SET (CTEST_SOURCE_DIRECTORY /usr/src/QGIS)
44#SET (CTEST_BINARY_DIRECTORY /usr/src/qgis-build)
55
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ services:
1313 - postgres
1414 environment :
1515 - CCACHE_DIR=/root/.ccache
16- - TRAVIS_BUILD_DIR =/root/QGIS
16+ - CTEST_BUILD_DIR =/root/QGIS
1717 - TRAVIS_BRANCH=${TRAVIS_BRANCH}
1818 - TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST}
1919 - TRAVIS_PULL_REQUEST_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH}
You can’t perform that action at this time.
0 commit comments