X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dc04aa0c2520dc7f24c94a71073105cce207b71e..fa26a7d998b5dcf2362c6c645f854b60ee0a8c56:/.travis.yml

diff --git a/.travis.yml b/.travis.yml
index a7867b43b4..80042df234 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,14 +21,14 @@ addons:
     packages:
     - gcc-4.7
     - g++-4.7
-#      - clang
-#- coverity_scan:
-#    project:
-#      name: "mquinson/simgrid"
-#    notification_email: martin.quinson@loria.fr
-#    build_command_prepend: "cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=OFF -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=OFF ."  coverity_scan:
-#    build_command:   "make VERBOSE=1"
-#    branch_pattern: coverity_scan
+  coverity_scan:
+    project:
+      name: "simgrid/simgrid"
+      description: "Build submitted via Travis CI"
+    notification_email: martin.quinson@ens-rennes.fr
+    build_command_prepend: "cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=OFF -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=OFF ."
+    build_command:   "make VERBOSE=1"
+    branch_pattern: coverity
 
 # Don't install lua from Debian as we need 5.3 and don't have a backport.
 #   Installing lua from the source does not make any dynamic library.
@@ -48,13 +48,12 @@ before_install:
    - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50 ; fi
    - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50 ; fi
 script:
-   - 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 . && make VERBOSE=1 && ctest --output-on-failure --timeout 100
-# branches:
-#   only:
-#      - master
+   - 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 . 
+   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then ./tools/internal/travis-sonarqube.sh ; else make VERBOSE=1 ; fi # run make in the sonar wrapper
+   - ctest --output-on-failure --timeout 100
 notifications:
   recipients:
-    - martin.quinson@loria.fr
+    - martin.quinson@ens-rennes.fr
   email:
     on_success: change
     on_failure: always