Skip to content

Commit

Permalink
use ninja and env var
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids committed Aug 14, 2017
1 parent 79977dd commit 591a403
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .ci/travis/linux/docker-build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions .ci/travis/travis.ctest
Original file line number Diff line number Diff line change
@@ -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}/build-docker)
SET (CTEST_BINARY_DIRECTORY $ENV{TRAVIS_BUILD_DIR})
#SET (CTEST_SOURCE_DIRECTORY /usr/src/QGIS)
#SET (CTEST_BINARY_DIRECTORY /usr/src/qgis-build)

Expand Down
2 changes: 1 addition & 1 deletion .docker/docker-compose.travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit 591a403

Please sign in to comment.