From 9a8e2f5bce8c6758d4367d21a66466a497d136fe Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 22 May 2017 15:10:08 +0200 Subject: [PATCH] travis: previous cosmetics commit made it fail in any case --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5f89b91668..14aaf1c584 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,10 +47,10 @@ addons: # - ls -lR $TRAVIS_BUILD_DIR/LuaInstall script: - - test "$TRAVIS_OS_NAME" == "osx" && brew update - - test "$TRAVIS_OS_NAME" == "osx" && brew install python3 - - test "$TRAVIS_OS_NAME" == "osx" && 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 . - - test "$TRAVIS_OS_NAME" == "linux" && 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=OFF -Denable_compile_warnings=ON . + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install python3; 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=OFF -Denable_compile_warnings=ON .; fi # 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 -- 2.20.1