Sonarqube /hotfix

Should fix most of the bugs reported in Sonarqube. @agullo and @fpruvost, please check that you agrre with the changes in examples.

.gitlab-ci.yml

@@ -20,16 +20,15 @@ image: hpclib/hiepacs
   stage: test
   script:
     - echo TESTS_RESTRICTION $TESTS_RESTRICTION
-    - echo BUILD_LOG $BUILD_LOG
-    - echo BUILD_COVERAGE $BUILD_COVERAGE
+    - echo BUILD_PREFIX
     - (cd build &&
        eval "ctest --no-compress-output -V
              $TESTS_RESTRICTION
              -D ExperimentalTest
              -D ExperimentalCoverage
              -D ExperimentalSubmit
-             | tee -a $BUILD_LOG")
-    - lcov --directory build --capture --output-file $BUILD_COVERAGE
+             | tee -a ../${BUILD_PREFIX}.log")
+    - lcov --directory build --capture --output-file ../${BUILD_PREFIX}.lcov
 
 stages:
   - build
@@ -41,22 +40,11 @@ before_script:
   - git submodule update --init --recursive
   - source .gitlab-ci-env.sh $SIMU
   - mkdir -p build
-  - export TESTS_RESTRICTION="-R \"shm_s|mpi_s\""
-  except:
-    - master@solverstack/chameleon
-
-before_script:
-  - git submodule update --init --recursive
-  - source .gitlab-ci-env.sh $SIMU
-  - mkdir -p build
-  - export TESTS_RESTRICTION=""
-  only:
-    - master@solverstack/chameleon
 
-build_starpu_cuda_mpi:
+build_starpu:
   <<: *build_script
   artifacts:
-    name: build_starpu_cuda_mpi
+    name: build_starpu
     expire_in: 48 hours
     paths:
       - build
@@ -85,46 +73,88 @@ build_quark:
     expire_in: 48 hours
     paths:
       - build
-      - chameleon-build-quark.log
+      - chameleon-quark.log
   variables:
     SIMU: simu
     BUILD_OPTIONS: "-DCHAMELEON_SCHED_QUARK=ON"
-    BUILD_LOG: ../chameleon-build-quark.log
+    BUILD_LOG: ../chameleon-quark.log
 
-test_starpu_cuda_mpi_branches:
+test_starpu_branches:
   <<: *test_script
+  variables:
+    TESTS_RESTRICTION: "-R \"shm_s|mpi_s\""
+    BUILD_PREFIX: chameleon-starpu-simgrid
   dependencies:
-    - build_starpu_cuda_mpi
+    - build_starpu
   artifacts:
-    name: test_starpu_cuda_mpi
+    name: test_starpu
     expire_in: 48 hours
     paths:
       - build
-      - chameleon-build-starpu.log
-      - chameleon_starpu_mpi.lcov
+      - ${BUILD_PREFIX}.log
+      - ${BUILD_PREFIX}.lcov
   only:
     - branches
   except:
     - master
 
-test_starpu_cuda_mpi_master:
+test_starpu_master:
   <<: *test_script
+  variables:
+    TESTS_RESTRICTION: ""
+    BUILD_PREFIX: chameleon-starpu
   dependencies:
-    - build_starpu_cuda_mpi
+    - build_starpu
   artifacts:
-    name: test_starpu_cuda_mpi
+    name: test_starpu
     expire_in: 48 hours
     paths:
       - build
-      - chameleon-build-starpu.log
-      - chameleon_starpu_mpi.lcov
+      - ${BUILD_PREFIX}.log
+      - ${BUILD_PREFIX}.lcov
+  only:
+    - master@solverstack/chameleon
+
+test_starpu_simgrid_branches:
+  <<: *test_script
+  variables:
+    TESTS_RESTRICTION: "-R \"shm_s|mpi_s\""
+    BUILD_PREFIX: chameleon-starpu-simgrid
+  dependencies:
+    - build_starpu_simgrid
+  artifacts:
+    name: test_starpu_simgrid
+    expire_in: 48 hours
+    paths:
+      - build
+      - ${BUILD_PREFIX}.log
+      - ${BUILD_PREFIX}.lcov
+  only:
+    - branches
+  except:
+    - master
+
+test_starpu_simgrid_master:
+  <<: *test_script
+  variables:
+    TESTS_RESTRICTION: ""
+    BUILD_PREFIX: chameleon-starpu-simgrid
+  dependencies:
+    - build_starpu_simgrid
+  artifacts:
+    name: test_starpu_simgrid
+    expire_in: 48 hours
+    paths:
+      - build
+      - ${BUILD_PREFIX}.log
+      - ${BUILD_PREFIX}.lcov
   only:
     - master@solverstack/chameleon
 
 sonar:
   stage: analysis
   dependencies:
-    - test_starpu_cuda_mpi_master
+    - test_starpu_master
   artifacts:
     name: chameleon_analysis
     expire_in: 1 week
@@ -136,7 +166,7 @@ sonar:
       - sonar.log
   script:
     - cat *.log > chameleon-build.log
-    - lcov -a $PWD/chameleon_starpu_mpi.lcov
+    - lcov -a $PWD/chameleon_starpu.lcov
            -a $PWD/chameleon_starpu_simgrid.lcov
            -a $PWD/chameleon_quark.lcov
            -o $PWD/chameleon.lcov