Skip to content
Permalink
Browse files

better var names

  • Loading branch information
3nids committed Aug 7, 2017
1 parent d33f725 commit 9631fab75ddede5d6bef386cbfb21b0c66dcb15d
Showing with 4 additions and 3 deletions.
  1. +1 −0 .ci/travis/macos/script.sh
  2. +2 −2 .ci/travis/travis.ctest
  3. +1 −1 .docker/docker-compose.travis.yml
@@ -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

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

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

0 comments on commit 9631fab

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