From 3b874e2e0341ef1eb9236304423e99628b600a90 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Thu, 4 Jul 2019 10:40:20 +0200
Subject: [PATCH] CI: fix gcov prefix
---
.gitlab-ci.yml | 1 +
CI/ubuntu-18.04-llvm-qa.cmake | 5 +++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d6692045f..5b387bd126 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -227,6 +227,7 @@ ubuntu-xdk-qa-code-coverage:
ctest -V -S CI/main_qa.cmake
-DIMAGE_NAME:string=ubuntu-18.04-llvm-qa
-DQA:BOOL=ON
+ - ls -lh build/cov_data
- gcovr -x -o build/coverage_report.xml build/cov_data
- saxon-xslt -o build/ctest_report.xml
build/Testing/`head -n 1 build/Testing/TAG`/Test.xml
diff --git a/CI/ubuntu-18.04-llvm-qa.cmake b/CI/ubuntu-18.04-llvm-qa.cmake
index f947d0d009..fa8e8e1aba 100644
--- a/CI/ubuntu-18.04-llvm-qa.cmake
+++ b/CI/ubuntu-18.04-llvm-qa.cmake
@@ -32,10 +32,11 @@ CMAKE_SHARED_LINKER_FLAGS:STRING=-fuse-ld=lld
# handle gcov setup
set(COVERAGE_OUTPUT_DIR "${CTEST_BINARY_DIRECTORY}/cov_data")
+file(MAKE_DIRECTORY "${COVERAGE_OUTPUT_DIR}")
string(REGEX MATCHALL "/[^/]" _slash_matches "${COVERAGE_OUTPUT_DIR}")
list(LENGTH _slash_matches COVERAGE_PREFIX_STRIP)
set(ENV{GCOV_PREFIX} "${COVERAGE_OUTPUT_DIR}")
set(ENV{GCOV_PREFIX_STRIP} "${COVERAGE_PREFIX_STRIP}")
-message("GCOV_PREFIX : ${GCOV_PREFIX}")
-message("GCOV_PREFIX_STRIP : ${GCOV_PREFIX_STRIP}")
+message("GCOV_PREFIX : $ENV{GCOV_PREFIX}")
+message("GCOV_PREFIX_STRIP : $ENV{GCOV_PREFIX_STRIP}")
--
GitLab