X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3d25ce2fc68666d4b674c4f710cde362aa584632..c956d27194c087c9c57e8fea7d8902ec3958adee:/tools/internal/travis-sonarqube.sh

diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh
index d069347e7b..65e549f996 100755
--- a/tools/internal/travis-sonarqube.sh
+++ b/tools/internal/travis-sonarqube.sh
@@ -5,14 +5,8 @@
 # Use it as a wrapper to your build command, eg: ./travis-sonarqube.sh make VERBOSE=1
 
 # On Mac OSX or with pull requests, you don't want to run SonarQube but to exec the build command directly.
-if [ ${TRAVIS_OS_NAME} != 'linux' ] || [ ${TRAVIS_PULL_REQUEST} != 'false' ] 
-then
-  exec "$@"
-fi
-# Passed this point, we are on Linux and not in a PR (exec never returns)
-
 
-# Be verbose and fail fast
+# Be verbose and fail fast
 set -ex
 
 # Install required software
@@ -37,11 +31,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
@@ -52,6 +49,8 @@ ctest -D ExperimentalCoverage
 # See https://docs.travis-ci.com/user/sonarqube/ for more info on tokens
 # don't show the token in the logs
 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' \
+sonar-scanner -Dsonar.host.url=https://sonarqube.com -Dsonar.login=$SONAR_TOKEN 2>&1 \
+  | 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