Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 2bc56bb

Browse files
3nidsm-kuhn
authored andcommittedSep 15, 2017
use ninja and env var
1 parent 7031e89 commit 2bc56bb

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed
 

‎.ci/travis/linux/docker-build-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ cmake \
3838

3939
export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
4040

41-
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
41+
export CTEST_BUILD_COMMAND=ninja
4242

4343
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
4444

‎.ci/travis/travis.ctest

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
SET (CTEST_SOURCE_DIRECTORY /root/QGIS/build-docker)
2-
SET (CTEST_BINARY_DIRECTORY /root/QGIS)
1+
SET (CTEST_SOURCE_DIRECTORY $ENV{TRAVIS_BUILD_DIR}/build-docker)
2+
SET (CTEST_BINARY_DIRECTORY $ENV{TRAVIS_BUILD_DIR})
33
#SET (CTEST_SOURCE_DIRECTORY /usr/src/QGIS)
44
#SET (CTEST_BINARY_DIRECTORY /usr/src/qgis-build)
55

‎.docker/docker-compose.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
- postgres
1414
environment:
1515
- CCACHE_DIR=/root/.ccache
16-
- TRAVIS_BUILD_DIR=${TRAVIS_BUILD_DIR}
16+
- TRAVIS_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}

0 commit comments

Comments
 (0)
Please sign in to comment.