X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26037f4ccb9b18c98581b419bee8524a19721619..386fdb787b4d39af174e239965e51008bc9c330d:/.travis.yml

diff --git a/.travis.yml b/.travis.yml
index b27fbd7cba..507fa5307f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,18 @@
+# NS3 is disabled because the version in ubuntu precise does not lead
+# to the same timings (precision error?)
+# Reenable with 
+#   cmake -Denable_ns3
+#   apt-get libns3-dev ns3
+#
+#
 language: cpp
 compiler:
    - gcc
-   - clang
+#  - 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 );
+#                                                                    ^~~~
 addons:
   apt: # Get recent versions of the compiler, even on Ubuntu Precise
       sources:
@@ -10,14 +21,15 @@ addons:
       - gcc-4.7
       - g++-4.7
       - clang
-# Still need sudo to get the recent version of gcc actually used
+# Install libboost-chrono1.48-dev to get boost 1.48 on Ubuntu Precise. What we really want is libboost-dev libboost-all-dev
+# Still need sudo for update-alternatives
 before_install:
-   - sudo apt-get update  -qq
-   - sudo apt-get install -y cmake valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-dev libboost-all-dev libns3-dev ns3
-   - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50
-   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50
+   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo apt-get update  -qq ; fi
+   - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo apt-get install -y cmake valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-chrono1.48-dev ; fi
+   - 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_ns3=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON . && make && ctest --output-on-failure --timeout 100
+   - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON . && make VERBOSE=1 && ctest --output-on-failure --timeout 100
 branches:
   only:
      - master
@@ -35,4 +47,3 @@ notifications:
 os:
   - linux
   - osx
-  - windows