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] Only build outside ctest on master

Browse Source
This commit is contained in:
Matthias Kuhn 2017-08-10 10:25:47 +02:00
parent e6c7421c08
commit 349c19752a
No known key found for this signature in database
GPG Key ID: A0E766808764D73F
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,9 +29,16 @@ export LD_PRELOAD=/lib/x86_64-linux-gnu/libSegFault.so
export CTEST_BUILD_COMMAND="/usr/bin/make -j3 -i -k"
pushd build
$CTEST_BUILD_COMMAND
popd
# This works around an issue where travis would timeout on master 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
# back. Better approaches VERY welcome.
if [[ ${TRAVIS_BRANCH} == "master" ]];
then
pushd build
$CTEST_BUILD_COMMAND
popd
fi
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