Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e28a06b..1026943 100644 (file)
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -16,11 +16,8 @@ jobs:
     steps:
       - checkout
       - run:
-          name: Build da stuff
+          name: Configure, build and test da stuff
           command: |
             mkdir _build
-            pushd _build; cmake -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON ..
-      - run:
-          name: Test da stuff
-          command: |
+            pushd _build; cmake -Denable_documentation=OFF -Denable_coverage=ON -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON ..  
             pushd _build ; make -j4 && ctest -j4 --output-on-failure