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

diff --git a/.travis.yml b/.travis.yml
index 99f0f5e7bc..3c814f5892 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,26 +5,32 @@
 #   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:
+    update: true
+    allow_unauthenticated: yes
+    sources:
+    - sourceline: ppa:samuel-bachmann/boost # Get boost 1.60 for Trusty
     packages:
     - cmake
     - valgrind
     - default-jdk
     - gfortran
-    - libboost-dev
-    - libboost-all-dev
+    - libboost1.60-dev
+    - libboost1.60-all-dev
+    - libdw-dev
+    - libevent-dev
+    - libunwind8-dev
+    - pybind11-dev
+  homebrew:
+    packages:
+    - python
   coverity_scan:
     project:
       name: "simgrid/simgrid"
@@ -44,13 +50,10 @@ addons:
 #   - ls -lR $TRAVIS_BUILD_DIR/LuaInstall
 
 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=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=ON -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
+   - 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 . || (echo XXX CMakeOutput.log; cat /home/travis/build/simgrid/simgrid/CMakeFiles/CMakeOutput.log; echo XXX CMakeError.log;cat /home/travis/build/simgrid/simgrid/CMakeFiles/CMakeError.log; exit 1) ; fi
+   # run make and ctest in the sonar wrapper on master/linux; run it directly in PR or OSX
+   - if [[ -e Makefile ]] && [[ "$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
@@ -58,6 +61,8 @@ notifications:
     on_success: change
     on_failure: always
   irc:
+    on_success: change
+    on_failure: always
     channels:
       - "irc.debian.org#simgrid"
   template: