From 038be345d71278dd3720e496e1510b89109ef021 Mon Sep 17 00:00:00 2001
From: Florent Pruvost <florent.pruvost@inria.fr>
Date: Wed, 11 Oct 2017 13:32:06 +0200
Subject: [PATCH] use absolute path to files for lcov add tracefile option

---
 .gitlab-ci.yml    | 22 +++++++++++-----------
 tools/analysis.sh |  5 ++---
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1813abc73..a81c11e36 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -82,13 +82,13 @@ test_starpu_mpi:
     name: starpu_mpi_test
     expire_in: 48 hours
     paths:
-      - coverage_starpu_mpi.tar.bz2
+      #- coverage_starpu_mpi.tar.bz2
       - chameleon_starpu_mpi.lcov
   script:
     - source .gitlab-ci-env.sh
     - git submodule update --init --recursive
     - (cd build && STARPU_SILENT=1 ctest --no-compress-output -R test_shm_s || /usr/bin/true && ctest --no-compress-output -R mpi_s || /usr/bin/true)
-    - find -name "*.gcda" | xargs tar cvjf coverage_starpu_mpi.tar.bz2
+    #- find -name "*.gcda" | xargs tar cvjf coverage_starpu_mpi.tar.bz2
     - lcov --directory build --capture --output-file chameleon_starpu_mpi.lcov
 
 test_starpu_simgrid:
@@ -99,13 +99,13 @@ test_starpu_simgrid:
     name: starpu_simgrid_test
     expire_in: 48 hours
     paths:
-      - coverage_starpu_simgrid.tar.bz2
+      #- coverage_starpu_simgrid.tar.bz2
       - chameleon_starpu_simgrid.lcov
   script:
     - source .gitlab-ci-env.sh simu
     - git submodule update --init --recursive
     - (cd build && STARPU_SILENT=1 ctest --no-compress-output -V || /usr/bin/true)
-    - find -name "*.gcda" | xargs tar cvjf coverage_starpu_simgrid.tar.bz2
+    #- find -name "*.gcda" | xargs tar cvjf coverage_starpu_simgrid.tar.bz2
     - lcov --directory build --capture --output-file chameleon_starpu_simgrid.lcov
 
 test_quark:
@@ -116,13 +116,13 @@ test_quark:
     name: quark_test
     expire_in: 48 hours
     paths:
-      - coverage_quark.tar.bz2
+      #- coverage_quark.tar.bz2
       - chameleon_quark.lcov
   script:
     - source .gitlab-ci-env.sh
     - git submodule update --init --recursive
     - (cd build && ctest --no-compress-output -R test_shm_s)
-    - find -name "*.gcda" | xargs tar cvjf coverage_quark.tar.bz2
+    #- find -name "*.gcda" | xargs tar cvjf coverage_quark.tar.bz2
     - lcov --directory build --capture --output-file chameleon_quark.lcov
 
 sonar:
@@ -145,11 +145,11 @@ sonar:
       - sonar.log
   script:
     - source .gitlab-ci-env.sh
-    - tar xvjf coverage_starpu_simgrid.tar.bz2
-    - tar xvjf coverage_starpu_mpi.tar.bz2
-    - tar xvjf coverage_quark.tar.bz2
-    - lcov -a chameleon_starpu_mpi.lcov -a chameleon_starpu_simgrid.lcov -a chameleon_quark.lcov -o chameleon.lcov
-    - genhtml -o coverage chameleon.lcov
+    #- tar xvjf coverage_starpu_simgrid.tar.bz2
+    #- tar xvjf coverage_starpu_mpi.tar.bz2
+    #- tar xvjf coverage_quark.tar.bz2
+    - lcov -a $PWD/chameleon_starpu_mpi.lcov -a $PWD/chameleon_starpu_simgrid.lcov -a $PWD/chameleon_quark.lcov -o $PWD/chameleon.lcov
+    #- genhtml -o coverage chameleon.lcov
     - lcov_cobertura.py chameleon.lcov --output chameleon-coverage.xml
     - ./tools/analysis.sh
   only:
diff --git a/tools/analysis.sh b/tools/analysis.sh
index cda4cd479..3db5ef5ae 100755
--- a/tools/analysis.sh
+++ b/tools/analysis.sh
@@ -15,10 +15,10 @@
 
 # capture coverage
 #lcov --directory . --capture --output-file ../chameleon.lcov
-lcov --directory build --capture --output-file chameleon.lcov
+#lcov --directory build --capture --output-file chameleon.lcov
 #cd ..
 #genhtml -o coverage chameleon.lcov
-lcov_cobertura.py chameleon.lcov --output chameleon-coverage.xml
+#lcov_cobertura.py chameleon.lcov --output chameleon-coverage.xml
 
 # filter sources:
 # - consider generated files in build
@@ -30,7 +30,6 @@ lcov_cobertura.py chameleon.lcov --output chameleon-coverage.xml
 export UNDEFINITIONS="-UCHAMELEON_USE_OPENCL -UWIN32 -UWIN64 -U_MSC_EXTENSIONS -U_MSC_VER -U__SUNPRO_C -U__SUNPRO_CC -U__sun -Usun -U__cplusplus"
 # run cppcheck analysis
 cppcheck -v -f --language=c --platform=unix64 --enable=all --xml --xml-version=2 --suppress=missingIncludeSystem ${UNDEFINITIONS} --file-list=./filelist.txt 2> chameleon-cppcheck.xml
-#cppcheck -v -f --language=c --platform=unix64 --enable=all --xml --xml-version=2 --suppress=missingIncludeSystem ${UNDEFINITIONS} `cat filelist.txt` 2> chameleon-cppcheck.xml
 # run rats analysis
 rats -w 3 --xml  `cat filelist.txt` > chameleon-rats.xml
 
-- 
GitLab