Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / tools / internal / travis-sonarqube.sh

diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh
index d069347..96558bb 100755 (executable)
--- 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 [ `git rev-parse --abbrev-ref HEAD` != "master" ] ; then
-  exit 0
+if [ "$TRAVIS_PULL_REQUEST" != "false" ] ; then
+  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