Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[travis] Workaround timeouts
  • Loading branch information
m-kuhn committed Sep 6, 2017
1 parent 63d0a91 commit 33f0a60
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions .ci/travis/linux/script.sh
Expand Up @@ -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

0 comments on commit 33f0a60

Please sign in to comment.