From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 3 Mar 2017 16:22:38 +0000 (+0100)
Subject: Sonar improvements
X-Git-Tag: v3_15~223
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3d25ce2fc68666d4b674c4f710cde362aa584632?hp=9b24d59d4ecbf7267ec217d1d7cf55084d61fe4a

Sonar improvements

- only run on master branch
- reduce coverage verbosity so that travis shows it all
---

diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh
index 6840e0fa39..d069347e7b 100755
--- a/tools/internal/travis-sonarqube.sh
+++ b/tools/internal/travis-sonarqube.sh
@@ -39,6 +39,11 @@ installBuildWrapper
 # Run ctest before sonar to gather coverage some information
 ctest --output-on-failure --timeout 100
 
+# Only run sonar on master (not on pull requests)
+if [ `git rev-parse --abbrev-ref HEAD` != "master" ] ; then
+  exit 0
+fi
+
 # generate the gcov files
 ctest -D ExperimentalCoverage
 
@@ -47,4 +52,6 @@ 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
+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/'