X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cab0603d891f15a240f3d0fa8bc12bd619ea9ece..4775ee0f232bccc4978dfbfb8153b7593be7dd77:/tools/internal/travis-sonarqube.sh diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh index 96558bbb6e..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 @@ -55,8 +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 \ No newline at end of file +exit $outcome