please sonar by killing useless parameters and cleanups

[simgrid.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index db60ae1..106ad7f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@
 #   apt-get libns3-dev ns3
 #
 #
-sudo: required
+#sudo: required
 dist: trusty
 language: cpp
 compiler:
@@ -30,7 +30,7 @@ addons:
       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_prepend: "cmake -Denable_documentation=OFF -Denable_coverage=ON -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
 
@@ -43,12 +43,14 @@ addons:
 #   - cd ..
 #   - ls -lR $TRAVIS_BUILD_DIR/LuaInstall
 
-# Still need sudo for update-alternatives
 script:
-   - sudo pip install subprocess32 # needed by tesh
-   - 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
+   - 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=ON -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 before sonar to get coverage info
+   - ./tools/internal/travis-sonarqube.sh make VERBOSE=1
+   # if sonar was not run (and if the build succeeded), run the tests manually
+   - if [[ "$TRAVIS_OS_NAME" == "osx" && -e bin/graphicator ]]; then ctest --output-on-failure --timeout 100 ; fi
 notifications:
   recipients:
     - martin.quinson@ens-rennes.fr