travis: more parallelism (extend previous commit).

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

diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh
index 076bebd..84a581c 100755 (executable)
--- a/tools/internal/travis-sonarqube.sh
+++ b/tools/internal/travis-sonarqube.sh
@@ -1,33 +1,28 @@
-#! /bin/sh
+#!/usr/bin/env sh
 
-# Install and run SonarQube on travis. 
+# Install and run SonarQube on travis.
 #
 # 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)
-
+# On macOS or with pull requests, you don't want to run SonarQube but to exec the build command directly.
 
-# Be verbose and fail fast
+# Be verbose and fail fast
 set -ex
 
 # Install required software
 installSonarQubeScanner() {
-  export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-2.6
+  local SONAR_SCANNER_VERSION=3.2.0.1227
+  export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION
   rm -rf $SONAR_SCANNER_HOME
   mkdir -p $SONAR_SCANNER_HOME
-  curl -sSLo $HOME/.sonar/sonar-scanner.zip http://repo1.maven.org/maven2/org/sonarsource/scanner/cli/sonar-scanner-cli/2.6/sonar-scanner-cli-2.6.zip
+  curl -sSLo $HOME/.sonar/sonar-scanner.zip http://repo1.maven.org/maven2/org/sonarsource/scanner/cli/sonar-scanner-cli/$SONAR_SCANNER_VERSION/sonar-scanner-cli-$SONAR_SCANNER_VERSION.zip
   unzip $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/
   rm $HOME/.sonar/sonar-scanner.zip
   export PATH=$SONAR_SCANNER_HOME/bin:$PATH
   export SONAR_SCANNER_OPTS="-server"
 }
 installBuildWrapper() {
-  curl -LsS https://sonarqube.org/static/cpp/build-wrapper-linux-x86.zip > build-wrapper-linux-x86.zip
+  curl -LsS https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip > build-wrapper-linux-x86.zip
   unzip build-wrapper-linux-x86.zip
 }
 installSonarQubeScanner
@@ -36,6 +31,27 @@ installBuildWrapper
 # triggers the compilation through the build wrapper to gather compilation database
 ./build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-outputs "$@"
 
-# and finally execute the actual SonarQube analysis (the SONAR_TOKEN is set from the travis web interface, to not expose it)
+# Run ctest before sonar to gather coverage some information
+set +e
+ctest -j4 --output-on-failure
+outcome=$?
+set -e
+
+# Only run sonar on master (not on pull requests)
+if [ "$TRAVIS_PULL_REQUEST" != "false" ] ; then
+  exit $outcome
+fi
+
+# generate the gcov files
+ctest -D ExperimentalCoverage
+
+# and finally execute the actual SonarQube analysis
+# (the SONAR_TOKEN is set from the travis web interface, to not expose it with an ongoing "set -x")
 # See https://docs.travis-ci.com/user/sonarqube/ for more info on tokens
-sonar-scanner -Dsonar.host.url=https://sonarqube.org -Dsonar.login=$SONAR_TOKEN
+# don't show the token in the logs
+set +x
+sonar-scanner -Dsonar.host.url=https://sonarcloud.io -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