From b47cdd6686caabe6026b7ecf841fcf24a44ec134 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 22 May 2017 17:09:05 +0200 Subject: [PATCH] try to please travis --- .travis.yml | 6 ++---- tools/internal/travis-sonarqube.sh | 7 ------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 14aaf1c584..b53e23e266 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,10 +51,8 @@ script: - 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 - - if [[ "$TRAVIS_OS_NAME" == "osx" && -e bin/graphicator ]]; then ctest --output-on-failure --timeout 100 ; fi + # run make and ctest in the sonar wrapper on master/linux; run it directly in PR or OSX + - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then ./tools/internal/travis-sonarqube.sh make VERBOSE=1; else make VERBOSE=1 && ctest --output-on-failure --timeout 100; fi notifications: recipients: - martin.quinson@ens-rennes.fr diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh index 370f6b5863..a4db50a5e1 100755 --- a/tools/internal/travis-sonarqube.sh +++ b/tools/internal/travis-sonarqube.sh @@ -5,13 +5,6 @@ # Use it as a wrapper to your build command, eg: ./travis-sonarqube.sh make VERBOSE=1 # On Mac OSX or with pull requests, you don't want to run SonarQube but to exec the build command directly. -if [ ${TRAVIS_OS_NAME} != 'linux' ] || [ ${TRAVIS_PULL_REQUEST} != 'false' ] -then - sh "$@" && ctest --output-on-failure - exit $? -fi -# Passed this point, we are on Linux and not in a PR (exec never returns) - # Be verbose and fail fast set -ex -- 2.20.1