try to get some coverage info for sonar on travis

diff --git a/.travis.yml b/.travis.yml
index 3153027..53d526a 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,8 +47,10 @@ script:
    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update         ; fi
    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; fi
    - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON . 
-   # run make in the sonar wrapper && run the tests only if the build suceeded
-   - ./tools/internal/travis-sonarqube.sh make VERBOSE=1 && ctest --output-on-failure --timeout 100
+   # run make in the sonar wrapper && run the tests before sonar to get coverage info
+   - ./tools/internal/travis-sonarqube.sh make VERBOSE=1
+   # if sonar was not run, run the tests manually
+   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then ctest --output-on-failure --timeout 100 ; fi
 notifications:
   recipients:
     - martin.quinson@ens-rennes.fr

diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh
index 21c9658..145772e 100755 (executable)
--- a/tools/internal/travis-sonarqube.sh
+++ b/tools/internal/travis-sonarqube.sh
@@ -36,7 +36,11 @@ 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
+ctest --output-on-failure --timeout 100
+
+# 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
 # don't show the token in the logs
 set +x