Reorganize travis scripts

qgis · Apr 27, 2017 · 60accc9 · 60accc9
1 parent ae2c06c
commit 60accc9
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 104 deletions.
diff --git a/ci/travis/linux/script.sh b/ci/travis/linux/script.sh
@@ -26,12 +26,14 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 export OTB_APPLICATION_PATH=${HOME}/OTB-5.6.0-Linux64/lib/otb/applications
 export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
 
+export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
+
 # xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest" -S ./qgis-test-travis.ctest --output-on-failure
 if [ "$CACHE_WARMING" = true ] ; then
   echo "WARNING: CACHE WARMING IS ACTIVE. SET CACHE_WARMING=false TO GET MEANINGFUL RESULTS."
   xvfb-run ctest -V -R NOTESTS -S ./qgis-test-travis.ctest --output-on-failure
   false
 else
   python ${TRAVIS_BUILD_DIR}/ci/travis/scripts/ctest2travis.py \
-	  xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure
+	  xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ${DIR}/../qgis-test-travis.ctest --output-on-failure
 fi
diff --git a/ci/travis/macos/script.sh b/ci/travis/macos/script.sh
@@ -28,7 +28,10 @@ ccache -M 1G
 # Travis will kill the job after approx 48 minutes, we subtract 8 minutes for
 # uploading and initialization (40) and subtract the bootstrapping time from that.
 TIMEOUT=$(expr 40 \* 60 - `date +%s` + `cat /tmp/travis_timestamp`)
-gtimeout ${TIMEOUT}s ctest -V -E "$(cat ${DIR}/blacklist.txt | gsed -r '/^(#.*?)?$/d' | gpaste -sd '|' -)" -S ${DIR}/travis.ctest --output-on-failure
+
+export CTEST_BUILD_COMMAND=/usr/local/bin/ninja
+
+gtimeout ${TIMEOUT}s ctest -V -E "$(cat ${DIR}/blacklist.txt | gsed -r '/^(#.*?)?$/d' | gpaste -sd '|' -)" -S ${DIR}/../travis.ctest --output-on-failure
 
 rv=$?
 

diff --git a/ci/travis/macos/travis.ctest → ci/travis/travis.ctest b/ci/travis/macos/travis.ctest → ci/travis/travis.ctest
@@ -3,9 +3,8 @@ SET (CTEST_BINARY_DIRECTORY "$ENV{TRAVIS_BUILD_DIR}/build")
 #SET (CTEST_SOURCE_DIRECTORY /usr/src/QGIS)
 #SET (CTEST_BINARY_DIRECTORY /usr/src/qgis-build)
 
-SET (CTEST_CMAKE_GENERATOR  "Ninja")
 SET (CTEST_CMAKE_COMMAND "cmake")
-SET (CTEST_BUILD_COMMAND "/usr/local/bin/ninja")
+SET (CTEST_BUILD_COMMAND $ENV{CTEST_BUILD_COMMAND})
 SET (CTEST_SITE "travis-ci.org")
 IF ($ENV{TRAVIS_PULL_REQUEST} STREQUAL "false")
   # No pull request

diff --git a/qgis-test-travis.ctest b/qgis-test-travis.ctest