Skip to content
Permalink
Browse files

use ninja and env var

  • Loading branch information
3nids committed Aug 8, 2017
1 parent 5a3d90b commit 1b9119d001732c95813ab667613c62067588ae47
Showing with 4 additions and 4 deletions.
  1. +1 −1 .ci/travis/linux/docker-build-test.sh
  2. +2 −2 .ci/travis/travis.ctest
  3. +1 −1 .docker/docker-compose.travis.yml
@@ -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

@@ -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)

@@ -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}

0 comments on commit 1b9119d

Please sign in to comment.
You can’t perform that action at this time.