Skip to content

Commit e57c3b3

Browse files
lbartolettilbartoletti
authoredSep 6, 2017
Merge branch 'master' into regularShape_gui
2 parents 37b6052 + a0e6b7f commit e57c3b3

File tree

1,186 files changed

+21375
-12474
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,186 files changed

+21375
-12474
lines changed
 

‎.ci/travis/linux/script.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
# #
1414
###########################################################################
1515

16+
set -e
17+
1618
export PYTHONPATH=${HOME}/osgeo4travis/lib/python3.3/site-packages/
1719
export PATH=${HOME}/osgeo4travis/bin:${HOME}/osgeo4travis/sbin:${HOME}/OTB-5.6.0-Linux64/bin:${PATH}
1820
export LD_LIBRARY_PATH=${HOME}/osgeo4travis/lib
@@ -27,18 +29,17 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
2729
export OTB_APPLICATION_PATH=${HOME}/OTB-5.6.0-Linux64/lib/otb/applications
2830
export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
2931

30-
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
32+
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i"
3133

32-
# This works around an issue where travis would timeout on master because
34+
# This works around an issue where travis would timeout because
3335
# when make is run inside ctest no output is generated. At the current time
34-
# nobody know why, but at least this workaround gets travis results for master
36+
# nobody know why, but at least this workaround gets travis results
3537
# back. Better approaches VERY welcome.
36-
if [[ ${TRAVIS_PULL_REQUEST} == "false" ]];
37-
then
38-
pushd build
39-
$CTEST_BUILD_COMMAND
40-
popd
41-
fi
38+
pushd build
39+
echo "travis_fold:start:qgis_build"
40+
$CTEST_BUILD_COMMAND
41+
echo "travis_fold:end:qgis_build"
42+
popd
4243

4344
python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py \
4445
xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ${DIR}/../travis.ctest --output-on-failure

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ tests/testdata/grass/wgs84/test/.gislock
6161
tests/testdata/grass/wgs84/test6/.gislock
6262
tests/testdata/grass/wgs84/test7/.gislock
6363
tests/testdata/*.aux.xml
64+
tests/testdata/landsat-int16-b1.tif.aux.xml
6465
tests/testdata/raster/*.aux.xml
6566
tests/testdata/raster/band1_byte_noct_epsg4326.tif.aux.xml
6667
tests/testdata/raster/band1_float32_noct_epsg4326.tif.aux.xml

0 commit comments

Comments
 (0)