From 8b5b1d27306e2e55d9abe27ccf2e347f30406a24 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 5 Sep 2015 22:55:36 +0200 Subject: [PATCH] [travis] don't fail so miserably on mac --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2d748e911a..0f4eb926e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,10 +24,10 @@ addons: # 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: - - test -e /usr/bin/apt-get && sudo apt-get update -qq - - test -e /usr/bin/apt-get && sudo apt-get install -y cmake valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-chrono1.48-dev - - test -e /usr/bin/apt-get && sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50 - - test -e /usr/bin/apt-get && sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50 + - 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 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 branches: -- 2.20.1