better var names

qgis · Sep 16, 2017 · 6af525e16b9bfc4858e3a7c0244a1a9096a5e2c6 · 6af525e
1 parent c9791b0
commit 6af525e16b9bfc4858e3a7c0244a1a9096a5e2c6
Unified Split

Showing with 4 additions and 3 deletions.

+1 −0 .ci/travis/macos/script.sh

+2 −2 .ci/travis/travis.ctest

+1 −1 .docker/docker-compose.travis.yml
diff --git a/.ci/travis/macos/script.sh b/.ci/travis/macos/script.sh
@@ -30,6 +30,7 @@ ccache -z
 TIMEOUT=$(expr 40 \* 60 - `date +%s` + `cat /tmp/travis_timestamp`)
 
 export CTEST_BUILD_COMMAND=/usr/local/bin/ninja
+export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR}
 
 gtimeout ${TIMEOUT}s ctest -V -E "$(cat ${DIR}/blacklist.txt | gsed -r '/^(#.*?)?$/d' | gpaste -sd '|' -)" -S ${DIR}/../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 $ENV{TRAVIS_BUILD_DIR})
-SET (CTEST_BINARY_DIRECTORY $ENV{TRAVIS_BUILD_DIR}/build-docker)
+SET (CTEST_SOURCE_DIRECTORY $ENV{CTEST_BUILD_DIR})
+SET (CTEST_BINARY_DIRECTORY $ENV{CTEST_BUILD_DIR}/build-docker)
 #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=/root/QGIS
+      - CTEST_BUILD_DIR=/root/QGIS
       - TRAVIS_BRANCH=${TRAVIS_BRANCH}
       - TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST}
       - TRAVIS_PULL_REQUEST_BRANCH=${TRAVIS_PULL_REQUEST_BRANCH}