mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-13 00:03:09 -04:00
[travis] Workaround timeouts
This commit is contained in:
parent
63d0a91566
commit
33f0a604a8
@ -29,16 +29,13 @@ export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
|
||||
|
||||
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
|
||||
# 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.
|
||||
if [[ ${TRAVIS_PULL_REQUEST} == "false" ]];
|
||||
then
|
||||
pushd build
|
||||
$CTEST_BUILD_COMMAND
|
||||
popd
|
||||
fi
|
||||
pushd build
|
||||
$CTEST_BUILD_COMMAND
|
||||
popd
|
||||
|
||||
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
|
||||
|
Loading…
x
Reference in New Issue
Block a user