From c7782239ed7fef01e39da792ac837f4cc44d0182 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sun, 6 Sep 2015 21:39:19 +0200 Subject: [PATCH] try to fix the third configuration on travis even if I don't know what this is --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ab5673bf75..159002fb10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,8 +26,8 @@ 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=OFF -Denable_compile_warnings=ON . && make VERBOSE=1 && ctest --output-on-failure --timeout 100 branches: -- 2.20.1