From 6f061d434785418d15027dbe359469c86229eeb7 Mon Sep 17 00:00:00 2001 From: Emmanuel Promayon Date: Thu, 8 Mar 2018 16:35:02 +0100 Subject: [PATCH 1/4] FIXED configure ctest to use gcov --- sdk/cmake/ctest/continuous.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/cmake/ctest/continuous.cmake b/sdk/cmake/ctest/continuous.cmake index 28dcbfba..3ecead73 100755 --- a/sdk/cmake/ctest/continuous.cmake +++ b/sdk/cmake/ctest/continuous.cmake @@ -195,6 +195,16 @@ while (${CTEST_ELAPSED_TIME} LESS ${CONTINUOUS_BUILD_DURATION}) message(STATUS "- Running test coverage...") set(CTEST_BUILD_TARGET camitk-test-coverage) ctest_build() + + if(NOT DEFINED CTEST_COVERAGE_COMMAND) + find_program(CTEST_COVERAGE_COMMAND NAMES gcov) + if(CTEST_COVERAGE_COMMAND) + message(STATUS "- ctest configured with gcov: ${CTEST_COVERAGE_COMMAND}") + else() + message(STATUS "- ctest not configured with gcov (gcov binary not found)") + endif() + endif() + ctest_coverage("${CTEST_BINARY_DIRECTORY}/camitk-test-coverage") ctest_submit(PARTS Coverage) -- GitLab From b7e33992a5f213b43396c1591ed963228491dbd6 Mon Sep 17 00:00:00 2001 From: Emmanuel Promayon Date: Thu, 8 Mar 2018 16:37:13 +0100 Subject: [PATCH 2/4] FIXED configure ctest to use gcov --- sdk/cmake/ctest/nightly.cmake | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/sdk/cmake/ctest/nightly.cmake b/sdk/cmake/ctest/nightly.cmake index 67e96299..23411fe9 100755 --- a/sdk/cmake/ctest/nightly.cmake +++ b/sdk/cmake/ctest/nightly.cmake @@ -182,7 +182,17 @@ endforeach() message(STATUS "- Running test coverage...") set(CTEST_BUILD_TARGET camitk-test-coverage) ctest_build() -ctest_coverage("${CTEST_BINARY_DIRECTORY}/camitk-test-coverage") + +if(NOT DEFINED CTEST_COVERAGE_COMMAND) + find_program(CTEST_COVERAGE_COMMAND NAMES gcov) + if(CTEST_COVERAGE_COMMAND) + message(STATUS "- ctest configured with gcov: ${CTEST_COVERAGE_COMMAND}") + else() + message(STATUS "- ctest not configured with gcov (gcov binary not found)") + endif() +endif() + +ctest_coverage() ctest_submit(PARTS Coverage) # Install locally this build version of CamiTK -- GitLab From 41dedf22382ed4e50fad8664d4af86a5951298e6 Mon Sep 17 00:00:00 2001 From: Emmanuel Promayon Date: Thu, 8 Mar 2018 16:38:26 +0100 Subject: [PATCH 3/4] FIXED no parameter required --- sdk/cmake/ctest/continuous.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/cmake/ctest/continuous.cmake b/sdk/cmake/ctest/continuous.cmake index 3ecead73..76ddd218 100755 --- a/sdk/cmake/ctest/continuous.cmake +++ b/sdk/cmake/ctest/continuous.cmake @@ -205,7 +205,7 @@ while (${CTEST_ELAPSED_TIME} LESS ${CONTINUOUS_BUILD_DURATION}) endif() endif() - ctest_coverage("${CTEST_BINARY_DIRECTORY}/camitk-test-coverage") + ctest_coverage() ctest_submit(PARTS Coverage) # Install locally this build version of CamiTK -- GitLab From 5b5e615e5071949585636270488c73f50394aff7 Mon Sep 17 00:00:00 2001 From: Emmanuel Promayon Date: Thu, 8 Mar 2018 16:39:41 +0100 Subject: [PATCH 4/4] FIXED configure ctest to use gcov --- sdk/cmake/ctest/experimental.cmake | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sdk/cmake/ctest/experimental.cmake b/sdk/cmake/ctest/experimental.cmake index 624d8d80..9780ac45 100755 --- a/sdk/cmake/ctest/experimental.cmake +++ b/sdk/cmake/ctest/experimental.cmake @@ -189,5 +189,15 @@ endforeach() message(STATUS "- Running test coverage ${subproject}...") set(CTEST_BUILD_TARGET camitk-test-coverage) ctest_build() + +if(NOT DEFINED CTEST_COVERAGE_COMMAND) + find_program(CTEST_COVERAGE_COMMAND NAMES gcov) + if(CTEST_COVERAGE_COMMAND) + message(STATUS "- ctest configured with gcov: ${CTEST_COVERAGE_COMMAND}") + else() + message(STATUS "- ctest not configured with gcov (gcov binary not found)") + endif() +endif() + ctest_coverage() ctest_submit(PARTS Coverage) -- GitLab