Skip to content

Commit ab77fee

Browse files
committedJan 4, 2017
Cache warming
1 parent f67cdc3 commit ab77fee

File tree

2 files changed

+43
-19
lines changed

2 files changed

+43
-19
lines changed
 

‎ci/travis/linux/install.sh

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,39 @@ CLANG_WARNINGS=""
3939
# Include this line for debug reasons
4040
# -DCMAKE_BUILD_TYPE=RelWithDebInfo \
4141
#
42-
cmake \
43-
-DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis \
44-
-DWITH_STAGED_PLUGINS=ON \
45-
-DWITH_GRASS=ON \
46-
-DWITH_GRASS7=ON \
47-
-DGRASS_PREFIX7=/home/travis/osgeo4travis/grass-7.0.4 \
48-
-DSUPPRESS_QT_WARNINGS=ON \
49-
-DENABLE_MODELTEST=ON \
50-
-DENABLE_PGTEST=ON \
51-
-DWITH_QSPATIALITE=ON \
52-
-DWITH_QWTPOLAR=OFF \
53-
-DWITH_APIDOC=ON \
54-
-DWITH_ASTYLE=ON \
55-
-DWITH_SERVER=ON \
56-
-DWITH_INTERNAL_YAML=OFF \
57-
-DDISABLE_DEPRECATED=ON \
58-
-DCXX_EXTRA_FLAGS="$CLANG_WARNINGS" \
59-
..
42+
CMAKE_FLAGS="
43+
-DCMAKE_PREFIX_PATH=/home/travis/osgeo4travis
44+
-DWITH_STAGED_PLUGINS=ON
45+
-DWITH_GRASS=ON
46+
-DWITH_GRASS7=ON
47+
-DGRASS_PREFIX7=/home/travis/osgeo4travis/grass-7.0.4
48+
-DSUPPRESS_QT_WARNINGS=ON
49+
-DENABLE_MODELTEST=ON
50+
-DENABLE_PGTEST=ON
51+
-DWITH_QSPATIALITE=ON
52+
-DWITH_QWTPOLAR=OFF
53+
-DWITH_APIDOC=ON
54+
-DWITH_ASTYLE=ON
55+
-DWITH_INTERNAL_YAML=OFF
56+
-DDISABLE_DEPRECATED=ON
57+
-DCXX_EXTRA_FLAGS=${CLANG_WARNINGS}
58+
"
59+
60+
# The following options trigger a minimalized build to
61+
# reduce the travis build time so we don't time out and
62+
# have a chance of slowly filling the ccache.
63+
if [ "$CACHE_WARMING" = true ] ; then
64+
CMAKE_FLAGS="
65+
${CMAKE_FLAGS}
66+
-DWITH_DESKTOP=OFF
67+
-DWITH_SERVER=OFF
68+
"
69+
else
70+
CMAKE_FLAGS="
71+
${CMAKE_FLAGS}
72+
-DWITH_DESKTOP=ON
73+
-DWITH_SERVER=ON
74+
"
75+
fi
76+
77+
cmake $CMAKE_FLAGS ..

‎ci/travis/linux/script.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,11 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2626
export OTB_APPLICATION_PATH=${HOME}/OTB-5.6.0-Linux64/lib/otb/applications
2727
export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
2828

29-
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
3029
# xvfb-run ctest -V -E "qgis_openstreetmaptest|qgis_wcsprovidertest" -S ./qgis-test-travis.ctest --output-on-failure
30+
if [ "$CACHE_WARMING" = true ] ; then
31+
echo "WARNING: CACHE WARMING IS ACTIVE. SET CACHE_WARMING=false TO GET MEANINGFUL RESULTS."
32+
xvfb-run ctest -V -R NOTESTS -S ./qgis-test-travis.ctest --output-on-failure
33+
false
34+
else
35+
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
36+
fi

0 commit comments

Comments
 (0)
Please sign in to comment.