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

diff --git a/.travis.yml b/.travis.yml
index db60ae1665..fcb08e69eb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,17 +5,12 @@
 #   apt-get libns3-dev ns3
 #
 #
-sudo: required
+#sudo: required
 dist: trusty
 language: cpp
 compiler:
    - gcc
-#  - clang # boost 1.48 raises an error on clang:
-#            /usr/include/boost/signals2/detail/auto_buffer.hpp:565:57: error:
-#              reference to non-static member function must be called
-#                        std::uninitialized_fill( buffer_, buffer_ + size, init_value );
-#                                                                    ^~~~
-#
+#  - clang 
 addons:
   apt:
     packages:
@@ -25,12 +20,15 @@ addons:
     - gfortran
     - libboost-dev
     - libboost-all-dev
+    - libdw-dev
+    - libevent-dev
+    - libunwind8-dev
   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_prepend: "cmake -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=OFF -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=OFF ."
     build_command:   "make VERBOSE=1"
     branch_pattern: coverity
 
@@ -43,12 +41,13 @@ 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 upgrade python; fi
+   - if [[ "$TRAVIS_OS_NAME" == "osx"   ]]; then cmake -Denable_model-checking=OFF -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON .; fi
+   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cmake -Denable_model-checking=ON  -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON .; fi
+   # run make and ctest in the sonar wrapper on master/linux; run it directly in PR or OSX
+   - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then ./tools/internal/travis-sonarqube.sh make VERBOSE=1; else make VERBOSE=1 && ctest --output-on-failure ; fi
 notifications:
   recipients:
     - martin.quinson@ens-rennes.fr