From cab0603d891f15a240f3d0fa8bc12bd619ea9ece Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 15 Mar 2017 18:10:30 +0100 Subject: [PATCH] travis: try to run sonar even if some tests are broken And also: don't set a timeout on tests, travis will kill us anyway. --- tools/internal/travis-sonarqube.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh index 406f86f66b..96558bbb6e 100755 --- a/tools/internal/travis-sonarqube.sh +++ b/tools/internal/travis-sonarqube.sh @@ -37,11 +37,14 @@ installBuildWrapper ./build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-outputs "$@" # Run ctest before sonar to gather coverage some information -ctest --output-on-failure --timeout 100 +set +e +ctest --output-on-failure +outcome=$? +set -e # Only run sonar on master (not on pull requests) if [ "$TRAVIS_PULL_REQUEST" != "false" ] ; then - exit 0 + exit $outcome fi # generate the gcov files @@ -55,3 +58,5 @@ set +x sonar-scanner -Dsonar.host.url=https://sonarqube.com -Dsonar.login=$SONAR_TOKEN \ | grep -v 'INFO: Parsing /home/travis/build/simgrid/simgrid/Testing/CoverageInfo' \ | grep -v 'WARN: File not analysed by Sonar, so ignoring coverage: /usr/include/' + +exit $outcome \ No newline at end of file -- 2.20.1