sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

[travis] Workaround timeouts

Browse Source
This commit is contained in:
Matthias Kuhn 2017-09-06 09:15:31 +02:00
parent 63d0a91566
commit 33f0a604a8
No known key found for this signature in database
GPG Key ID: A0E766808764D73F
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
.ci/travis/linux/script.sh
View File

@ -29,16 +29,13 @@ export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k" export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
# This works around an issue where travis would timeout on master because # This works around an issue where travis would timeout because
# when make is run inside ctest no output is generated. At the current time # when make is run inside ctest no output is generated. At the current time
# nobody know why, but at least this workaround gets travis results for master # nobody know why, but at least this workaround gets travis results
# back. Better approaches VERY welcome. # back. Better approaches VERY welcome.
if [[ ${TRAVIS_PULL_REQUEST} == "false" ]]; pushd build
then $CTEST_BUILD_COMMAND
pushd build popd
$CTEST_BUILD_COMMAND
popd
fi
python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py \ python ${TRAVIS_BUILD_DIR}/.ci/travis/scripts/ctest2travis.py \
xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ${DIR}/../travis.ctest --output-on-failure xvfb-run ctest -V -E "$(cat ${DIR}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S ${DIR}/../travis.ctest --output-on-failure