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

diff --git a/.travis.yml b/.travis.yml
index 0f4eb926e0..2903aea1cd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,10 +26,10 @@ addons:
 before_install:
    - if test -e /usr/bin/apt-get ; then sudo apt-get update  -qq ; fi
    - if test -e /usr/bin/apt-get ; then sudo apt-get install -y cmake valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-chrono1.48-dev ; fi
-   - if test -e /usr/bin/apt-get ; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50 ; fi
-   - if test -e /usr/bin/apt-get ; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50 ; fi
+   - if test -e /usr/bin/apt-get -a -e /usr/bin/gcc-4.7 ; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50 ; fi
+   - if test -e /usr/bin/apt-get -a -e /usr/bin/g++-4.7 ; 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=ON -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=ON -Denable_compile_warnings=ON . && make VERBOSE=1 && 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
@@ -47,4 +47,3 @@ notifications:
 os:
   - linux
   - osx
-  - windows