From db01844895adb881f8e852935efa6cb1873f78cb Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 10 Jan 2019 14:48:54 +0100 Subject: [PATCH] [travis] There are only 2 cores available. --- .travis.yml | 4 ++-- tools/internal/travis-sonarqube.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c1645ae17a..5757511c3f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,8 +50,8 @@ script: - 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=ON -Denable_compile_warnings=ON . || (echo XXX CMakeOutput.log; cat /home/travis/build/simgrid/simgrid/CMakeFiles/CMakeOutput.log; echo XXX CMakeError.log;cat /home/travis/build/simgrid/simgrid/CMakeFiles/CMakeError.log; exit 1) ; fi # run make and ctest in the sonar wrapper on master/linux; run it directly in PR or OSX - # - if [[ -e Makefile ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then ./tools/internal/travis-sonarqube.sh make -j4 VERBOSE=1; else make -j4 VERBOSE=1 && ctest -j4 --output-on-failure ; fi - - make -j4 VERBOSE=1 && ctest -j4 --output-on-failure + # - if [[ -e Makefile ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "${TRAVIS_PULL_REQUEST}" == "false" ]]; then ./tools/internal/travis-sonarqube.sh make -j2 VERBOSE=1; else make -j2 VERBOSE=1 && ctest -j2 --output-on-failure ; fi + - make -j2 VERBOSE=1 && ctest -j2 --output-on-failure notifications: recipients: - martin.quinson@ens-rennes.fr diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh index 98411efe52..94b05c8e24 100755 --- a/tools/internal/travis-sonarqube.sh +++ b/tools/internal/travis-sonarqube.sh @@ -34,7 +34,7 @@ installBuildWrapper # Run ctest before sonar to gather coverage some information # EDIT: Don't run the tests on travis because they take too much time. #set +e -#ctest -j4 --output-on-failure +#ctest -j2 --output-on-failure #outcome=$? #set -e outcome=0 -- 2.20.1