use ninja and env var

qgis · Aug 14, 2017 · 591a403 · 591a403
1 parent 79977dd
commit 591a403
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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)
 

diff --git 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}