diff --git a/ci/travis/linux/install.sh b/ci/travis/linux/install.sh index e1e9c5affd2..48a0b377580 100755 --- a/ci/travis/linux/install.sh +++ b/ci/travis/linux/install.sh @@ -39,21 +39,39 @@ CLANG_WARNINGS="" # Include this line for debug reasons # -DCMAKE_BUILD_TYPE=RelWithDebInfo \ # -cmake \ - -DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis \ - -DWITH_STAGED_PLUGINS=ON \ - -DWITH_GRASS=ON \ - -DWITH_GRASS7=ON \ - -DGRASS_PREFIX7=/home/travis/osgeo4travis/grass-7.0.4 \ - -DSUPPRESS_QT_WARNINGS=ON \ - -DENABLE_MODELTEST=ON \ - -DENABLE_PGTEST=ON \ - -DWITH_QSPATIALITE=ON \ - -DWITH_QWTPOLAR=OFF \ - -DWITH_APIDOC=ON \ - -DWITH_ASTYLE=ON \ - -DWITH_SERVER=ON \ - -DWITH_INTERNAL_YAML=OFF \ - -DDISABLE_DEPRECATED=ON \ - -DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \ - .. +CMAKE_FLAGS=" + -DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis + -DWITH_STAGED_PLUGINS=ON + -DWITH_GRASS=ON + -DWITH_GRASS7=ON + -DGRASS_PREFIX7=/home/travis/osgeo4travis/grass-7.0.4 + -DSUPPRESS_QT_WARNINGS=ON + -DENABLE_MODELTEST=ON + -DENABLE_PGTEST=ON + -DWITH_QSPATIALITE=ON + -DWITH_QWTPOLAR=OFF + -DWITH_APIDOC=ON + -DWITH_ASTYLE=ON + -DWITH_INTERNAL_YAML=OFF + -DDISABLE_DEPRECATED=ON + -DCXX_EXTRA_FLAGS=${CLANG_WARNINGS} + " + +# The following options trigger a minimalized build to +# reduce the travis build time so we don't time out and +# have a chance of slowly filling the ccache. +if [ "$CACHE_WARMING" = true ] ; then + CMAKE_FLAGS=" + ${CMAKE_FLAGS} + -DWITH_DESKTOP=OFF + -DWITH_SERVER=OFF + " +else + CMAKE_FLAGS=" + ${CMAKE_FLAGS} + -DWITH_DESKTOP=ON + -DWITH_SERVER=ON + " +fi + +cmake $CMAKE_FLAGS .. diff --git a/ci/travis/linux/script.sh b/ci/travis/linux/script.sh index 42b733cf62f..95a6836ff34 100755 --- a/ci/travis/linux/script.sh +++ b/ci/travis/linux/script.sh @@ -26,5 +26,11 @@ 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 -xvfb-run ctest -V -E "qgis_filedownloader|qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsWFSProviderGUI|qgis_ziplayertest|$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure # 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 + xvfb-run ctest -V -E "qgis_filedownloader|qgis_openstreetmaptest|qgis_wcsprovidertest|PyQgsWFSProviderGUI|qgis_ziplayertest|$(cat ${DIR}/blacklist.txt | paste -sd '|' -)" -S ./qgis-test-travis.ctest --output-on-failure +fi