From afe9e5d01c86330e33f5aafe39f2222fdc4f615e Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 30 Jan 2020 23:36:08 +0100 Subject: [PATCH] be coherent on Java vs. MSG on travis, circleci and appveyor --- .appveyor.yml | 2 +- .circleci/config.yml | 2 +- .travis.yml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 241134742c..629c106ee9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -43,7 +43,7 @@ install: - cmd: git clone --depth=1 https://github.com/pybind/pybind11.git build_script: -- cmake -G "MinGW Makefiles" -Denable_lua=OFF -Denable_documentation=OFF -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF . +- cmake -G "MinGW Makefiles" -Denable_lua=OFF -Denable_documentation=OFF -Denable_java=ON -Denable_MSG=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF . - mingw32-make.exe VERBOSE=1 java-all python-bindings # Only the Java and Python parts - ctest --output-on-failure -R java - ctest --output-on-failure -R python diff --git a/.circleci/config.yml b/.circleci/config.yml index 285e3743c6..fd17da4d2d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,5 +19,5 @@ jobs: name: Configure, build and test da stuff command: | mkdir _build && cd _build - cmake -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON .. + cmake -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_MSG=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON .. make -j4 tests && ctest -j4 --output-on-failure diff --git a/.travis.yml b/.travis.yml index 15a91d2250..a27b185c29 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ jobs: script: - sudo apt-get update -qq - sudo apt-get install cmake valgrind gfortran libboost-dev libboost-all-dev libdw-dev libevent-dev libunwind8-dev pybind11-dev - - (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)) + - (cmake -Denable_model-checking=ON -Denable_documentation=OFF -Denable_coverage=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)) - make -j2 VERBOSE=1 all && make -j2 tests && ctest -j2 --output-on-failure - os: windows script: @@ -58,7 +58,7 @@ jobs: - export JAVA_HOME='C:/Program Files/Java/jdk1.8.0_211' # We need pybind11. SimGrid will pick it automatically if the subdir is here # - git clone --depth=1 https://github.com/pybind/pybind11.git - - cmake -G "MinGW Makefiles" -Denable_lua=OFF -Denable_documentation=OFF -Denable_java=ON -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF . + - cmake -G "MinGW Makefiles" -Denable_lua=OFF -Denable_documentation=OFF -Denable_smpi=OFF -Denable_mallocators=OFF -Denable_lto=OFF . - df -h - du -hs /tmp || true - mingw32-make.exe VERBOSE=1 java-all && ctest --output-on-failure -R java @@ -69,7 +69,7 @@ jobs: osx_image: xcode11 script: - export LIBRARY_PATH=/usr/local/lib/gcc/9 - - 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 . + - cmake -Denable_model-checking=OFF -Denable_documentation=OFF -Denable_coverage=ON -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON . - make -j2 VERBOSE=1 all && make -j2 tests && ctest -j2 --output-on-failure notifications: recipients: -- 2.20.1