This is an automated email from the ASF dual-hosted git repository.
pnoltes pushed a commit to branch feature/coverage_on_github_workflow
in repository https://gitbox.apache.org/repos/asf/celix.git
The following commit(s) were added to
refs/heads/feature/coverage_on_github_workflow by this push:
new dd11d22 Refactoring of the setup_target_for_coverage CMake command,
now only needs a add_test target name.
dd11d22 is described below
commit dd11d223f83d623bca564b7b9238596207d351b6
Author: Pepijn Noltes <[email protected]>
AuthorDate: Fri Apr 17 18:09:29 2020 +0200
Refactoring of the setup_target_for_coverage CMake command, now only needs
a add_test target name.
---
bundles/http_admin/test/CMakeLists.txt | 2 +-
.../pubsub_protocol_wire_v1/gtest/CMakeLists.txt | 2 +-
bundles/pubsub/test/CMakeLists.txt | 12 ++--
.../remote_service_admin_dfi/gtest/CMakeLists.txt | 2 +-
.../private/test/CMakeLists.txt | 2 +-
.../topology_manager/tms_tst/CMakeLists.txt | 2 +-
bundles/shell/shell/test/CMakeLists.txt | 2 +-
cmake/celix_project/CodeCoverage.cmake | 75 +++++++++++++---------
libs/dfi/gtest/CMakeLists.txt | 2 +-
libs/framework/CMakeLists.txt | 40 ++++++------
libs/framework/gtest/CMakeLists.txt | 2 +-
libs/utils/CMakeLists.txt | 20 +++---
.../bundles/config_admin/CMakeLists.txt | 2 +-
.../config_admin/config_admin_tst/CMakeLists.txt | 2 +-
14 files changed, 91 insertions(+), 76 deletions(-)
diff --git a/bundles/http_admin/test/CMakeLists.txt
b/bundles/http_admin/test/CMakeLists.txt
index 511d3bc..7a5735e 100644
--- a/bundles/http_admin/test/CMakeLists.txt
+++ b/bundles/http_admin/test/CMakeLists.txt
@@ -57,7 +57,7 @@ target_link_libraries(http_websocket_tests PRIVATE
Celix::http_admin_api ${CPPUT
target_include_directories(http_websocket_tests SYSTEM PRIVATE
${CPPUTEST_INCLUDE_DIR})
add_test(NAME http_websocket_tests COMMAND http_websocket_tests
WORKING_DIRECTORY $<TARGET_PROPERTY:http_websocket_tests,CONTAINER_LOC>)
-SETUP_TARGET_FOR_COVERAGE(http_websocket_tests http_websocket_tests
${CMAKE_BINARY_DIR}/coverage/http_websocket_tests/http_websocket_tests ..)
+setup_target_for_coverage(http_websocket_tests SCAN_DIR
${CMAKE_BINARY_DIR}/bundles/http_admin/http_admin)
get_target_property(http_admin_service_cmp Celix::http_admin BUNDLE_FILE)
get_target_property(http_admin_sut_cmp http_admin_sut BUNDLE_FILE)
diff --git a/bundles/pubsub/pubsub_protocol_wire_v1/gtest/CMakeLists.txt
b/bundles/pubsub/pubsub_protocol_wire_v1/gtest/CMakeLists.txt
index 48de96e..4420e5c 100644
--- a/bundles/pubsub/pubsub_protocol_wire_v1/gtest/CMakeLists.txt
+++ b/bundles/pubsub/pubsub_protocol_wire_v1/gtest/CMakeLists.txt
@@ -25,4 +25,4 @@ target_include_directories(celix_pswp_tests PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}/
target_link_libraries(celix_pswp_tests PRIVATE celix_wire_protocol_v1_impl
GTest::GTest Celix::pubsub_spi)
add_test(NAME celix_pswp_tests COMMAND celix_pswp_tests)
-SETUP_TARGET_FOR_COVERAGE(celix_pswp_tests_cov celix_cxx_pswp_tests
${CMAKE_BINARY_DIR}/coverage/bundles/pubsub/protocol_wire_v1 ..)
\ No newline at end of file
+setup_target_for_coverage(celix_pswp_tests SCAN_DIR ..)
\ No newline at end of file
diff --git a/bundles/pubsub/test/CMakeLists.txt
b/bundles/pubsub/test/CMakeLists.txt
index 5081064..8361ea0 100644
--- a/bundles/pubsub/test/CMakeLists.txt
+++ b/bundles/pubsub/test/CMakeLists.txt
@@ -125,7 +125,7 @@ if (BUILD_PUBSUB_PSA_UDP_MC)
#TODO fix issues with UDPMC and reanble test again
#add_test(NAME pubsub_udpmc_tests COMMAND pubsub_udpmc_tests
WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_udpmc_tests,CONTAINER_LOC>)
- #SETUP_TARGET_FOR_COVERAGE(pubsub_udpmc_tests_cov pubsub_udpmc_tests
${CMAKE_BINARY_DIR}/coverage/pubsub_udpmc_tests/pubsub_udpmc_tests ..)
+ #setup_target_for_coverage(pubsub_udpmc_tests_cov pubsub_udpmc_tests
${CMAKE_BINARY_DIR}/coverage/pubsub_udpmc_tests/pubsub_udpmc_tests ..)
endif()
if (BUILD_PUBSUB_PSA_TCP)
@@ -148,7 +148,7 @@ if (BUILD_PUBSUB_PSA_TCP)
target_link_libraries(pubsub_tcp_tests PRIVATE Celix::pubsub_api
${CPPUTEST_LIBRARIES} Jansson Celix::dfi)
target_include_directories(pubsub_tcp_tests SYSTEM PRIVATE
${CPPUTEST_INCLUDE_DIR} test)
add_test(NAME pubsub_tcp_tests COMMAND pubsub_tcp_tests WORKING_DIRECTORY
$<TARGET_PROPERTY:pubsub_tcp_tests,CONTAINER_LOC>)
- SETUP_TARGET_FOR_COVERAGE(pubsub_tcp_tests_cov pubsub_tcp_tests
${CMAKE_BINARY_DIR}/coverage/pubsub_tcp_tests/pubsub_tcp_tests ..)
+ setup_target_for_coverage(pubsub_tcp_tests SCAN_DIR ..)
add_celix_container(pubsub_tcp_endpoint_tests
@@ -174,7 +174,7 @@ if (BUILD_PUBSUB_PSA_TCP)
#TCP Endpoint test is disabled because the test is not stable when running
on Travis
if (ENABLE_PUBSUB_PSA_TCP_ENDPOINT_TEST)
add_test(NAME pubsub_tcp_endpoint_tests COMMAND
pubsub_tcp_endpoint_tests WORKING_DIRECTORY
$<TARGET_PROPERTY:pubsub_tcp_endpoint_tests,CONTAINER_LOC>)
- SETUP_TARGET_FOR_COVERAGE(pubsub_tcp_endpoint_tests_cov
pubsub_tcp_endpoint_tests
${CMAKE_BINARY_DIR}/coverage/pubsub_tcp_endpoint_tests/pubsub_tcp_endpoint_tests
..)
+ setup_target_for_coverage(pubsub_tcp_endpoint_tests SCAN_DIR ..)
endif()
endif()
@@ -198,7 +198,7 @@ if (BUILD_PUBSUB_PSA_WS)
target_link_libraries(pubsub_websocket_tests PRIVATE Celix::pubsub_api
${CPPUTEST_LIBRARIES} Jansson Celix::dfi)
target_include_directories(pubsub_websocket_tests SYSTEM PRIVATE
${CPPUTEST_INCLUDE_DIR} test)
add_test(NAME pubsub_websocket_tests COMMAND pubsub_websocket_tests
WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_websocket_tests,CONTAINER_LOC>)
- SETUP_TARGET_FOR_COVERAGE(pubsub_websocket_tests_cov
pubsub_websocket_tests
${CMAKE_BINARY_DIR}/coverage/pubsub_websocket_tests/pubsub_websocket_tests ..)
+ setup_target_for_coverage(pubsub_websocket_tests SCAN_DIR ..)
endif()
if (BUILD_PUBSUB_PSA_ZMQ)
@@ -220,7 +220,7 @@ if (BUILD_PUBSUB_PSA_ZMQ)
target_link_libraries(pubsub_zmq_tests PRIVATE Celix::pubsub_api
${CPPUTEST_LIBRARIES} Jansson Celix::dfi)
target_include_directories(pubsub_zmq_tests SYSTEM PRIVATE
${CPPUTEST_INCLUDE_DIR} test)
add_test(NAME pubsub_zmq_tests COMMAND pubsub_zmq_tests WORKING_DIRECTORY
$<TARGET_PROPERTY:pubsub_zmq_tests,CONTAINER_LOC>)
- SETUP_TARGET_FOR_COVERAGE(pubsub_zmq_tests_cov pubsub_zmq_tests
${CMAKE_BINARY_DIR}/coverage/pubsub_zmq_tests/pubsub_zmq_tests ..)
+ setup_target_for_coverage(pubsub_zmq_tests SCAN_DIR ..)
add_celix_container(pubsub_zmq_zerocopy_tests
@@ -245,5 +245,5 @@ if (BUILD_PUBSUB_PSA_ZMQ)
#TODO fix issues with ZeroCopy and reanble test again
add_test(NAME pubsub_zmq_zerocopy_tests COMMAND pubsub_zmq_zerocopy_tests
WORKING_DIRECTORY $<TARGET_PROPERTY:pubsub_zmq_zerocopy_tests,CONTAINER_LOC>)
- SETUP_TARGET_FOR_COVERAGE(pubsub_zmq_zerocopy_tests_cov
pubsub_zmq_zerocopy_tests
${CMAKE_BINARY_DIR}/coverage/pubsub_zmq_tests/pubsub_zmq_zerocopy_tests ..)
+ setup_target_for_coverage(pubsub_zmq_zerocopy_tests SCAN_DIR ..)
endif ()
diff --git
a/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt
b/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt
index 793d167..f8abab3 100644
--- a/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt
+++ b/bundles/remote_services/remote_service_admin_dfi/gtest/CMakeLists.txt
@@ -68,5 +68,5 @@ add_dependencies(test_rsa_dfi
)
add_test(NAME run_test_rsa_dfi COMMAND test_rsa_dfi)
-SETUP_TARGET_FOR_COVERAGE(test_rsa_dfi_cov test_rsa_dfi
${CMAKE_BINARY_DIR}/coverage/test_rsa_dfi/test_rsa_dfi)
+setup_target_for_coverage(test_rsa_dfi SCAN_DIR ..)
diff --git
a/bundles/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt
b/bundles/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt
index 44bd290..21b88ce 100644
---
a/bundles/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt
+++
b/bundles/remote_services/remote_service_admin_shm/private/test/CMakeLists.txt
@@ -54,5 +54,5 @@ configure_file(server.properties.in server.properties)
add_dependencies(test_rsa_shm remote_service_admin_shm calculator
org.apache.celix.calc.api.Calculator_proxy
org.apache.celix.calc.api.Calculator_endpoint)
#add_test(NAME run_test_rsa_shm COMMAND test_rsa_shm)
-#SETUP_TARGET_FOR_COVERAGE(test_rsa_shm_cov test_rsa_shm
${CMAKE_BINARY_DIR}/coverage/test_rsa_shm/test_rsa_shm)
+#setup_target_for_coverage(test_rsa_shm_cov test_rsa_shm
${CMAKE_BINARY_DIR}/coverage/test_rsa_shm/test_rsa_shm)
diff --git a/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt
b/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt
index 91887d3..75827a2 100644
--- a/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt
+++ b/bundles/remote_services/topology_manager/tms_tst/CMakeLists.txt
@@ -71,5 +71,5 @@ configure_file("scope4.json" "scope4.json")
add_test(NAME run_test_tm_scoped COMMAND test_tm_scoped)
-SETUP_TARGET_FOR_COVERAGE(test_tm_scoped_cov test_tm_scoped
${CMAKE_BINARY_DIR}/coverage/test_tm_scoped/test_tm_scoped)
+setup_target_for_coverage(test_tm_scoped SCAN_DIR ..)
diff --git a/bundles/shell/shell/test/CMakeLists.txt
b/bundles/shell/shell/test/CMakeLists.txt
index 1596cb3..fc3dbc6 100644
--- a/bundles/shell/shell/test/CMakeLists.txt
+++ b/bundles/shell/shell/test/CMakeLists.txt
@@ -32,5 +32,5 @@ if (CELIX_INSTALL_DEPRECATED_API)
endif ()
add_test(NAME test_shell COMMAND test_shell)
-SETUP_TARGET_FOR_COVERAGE(test_shell_cov test_shell
${CMAKE_BINARY_DIR}/coverage/test_shell/test_shell ..)
+setup_target_for_coverage(test_shell SCAN_DIR ..)
diff --git a/cmake/celix_project/CodeCoverage.cmake
b/cmake/celix_project/CodeCoverage.cmake
index 98b4ca3..03673fe 100644
--- a/cmake/celix_project/CodeCoverage.cmake
+++ b/cmake/celix_project/CodeCoverage.cmake
@@ -75,11 +75,10 @@ IF(ENABLE_CODE_COVERAGE)
IF(NOT TARGET coverage)
add_custom_target(coverage
- COMMAND ${CMAKE_COMMAND} -E make_directory coverage_results
- COMMAND ${GENHTML_PATH} -o coverage_results coverage/*/*.info.cleaned
-
+ COMMAND ${CMAKE_COMMAND} -E make_directory coverage_results
+ COMMAND ${GENHTML_PATH} -o coverage_results coverage/*.info.cleaned
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
- COMMENT "Generating report.\nOpen ./${_outputname}/index.html in
your browser to view the coverage report."
+ COMMENT "Generating report.\nOpen index.html in your browser to
view the coverage report."
)
SET_TARGET_PROPERTIES(coverage PROPERTIES COVERAGE_TARGET_ADDED "")
@@ -87,14 +86,30 @@ IF(ENABLE_CODE_COVERAGE)
ENDIF(ENABLE_CODE_COVERAGE)
-# Param _targetname The name of new the custom make target
-# Param _testrunner The name of the target which runs the tests
-# Param _outputname lcov output is generated as _outputname.info
-# HTML report is generated in _outputname/index.html
-# Optional fourth parameter is passed as arguments to _testrunner
-# Pass them in list form, e.g.: "-j;2" for -j 2
-FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
- IF(ENABLE_CODE_COVERAGE)
+#[[
+Setup provided test target for coverage generation.
+the <test_target> should be a CMake target created with a add_test CMake
command.
+
+setup_target_for_coverage(<test_target>
+ [c <dir>]
+ [ARGUMENTS arguments...]
+)
+
+
+Optional arguments are:
+- SCAN_DIR: The directory used to scan for source files. Default is .
+- ARGUMENTS: The arguments to pass to the test runnner
+]]
+function (setup_target_for_coverage)
+ if (ENABLE_CODE_COVERAGE)
+ list(GET ARGN 0 TEST_TARGET_NAME)
+ list(REMOVE_AT ARGN 0)
+
+ set(OPTIONS )
+ set(ONE_VAL_ARGS SCAN_DIR)
+ set(MULTI_VAL_ARGS ARGUMENTS)
+ cmake_parse_arguments(COVERAGE "${OPTIONS}" "${ONE_VAL_ARGS}"
"${MULTI_VAL_ARGS}" ${ARGN})
+
IF(NOT LCOV_PATH)
MESSAGE(FATAL_ERROR "lcov not found! Aborting...")
ENDIF() # NOT LCOV_PATH
@@ -103,31 +118,31 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname
_testrunner _outputname)
MESSAGE(FATAL_ERROR "genhtml not found! Aborting...")
ENDIF() # NOT GENHTML_PATH
- set(SCAN_DIR ".")
- if (NOT ARGV3)
- set(SCAN_DIR ".")
- else()
- set(SCAN_DIR "${ARGV3}")
- endif ()
+ if (NOT COVERAGE_SCAN_DIR)
+ set(COVERAGE_SCAN_DIR ".")
+ endif()
+
+ set(OUTPUT_FILE
"${CMAKE_BINARY_DIR}/coverage/${TEST_TARGET_NAME}.info")
# Setup target
- ADD_CUSTOM_TARGET(${_targetname}_coverage
+ add_custom_target(${TEST_TARGET_NAME}_coverage
# Cleanup lcov
- ${LCOV_PATH} --directory . --zerocounters
+ COMMAND ${LCOV_PATH} --directory . --zerocounters
- # Run tests
- COMMAND ${_testrunner} ${ARGV3}
+ COMMAND ${CMAKE_CTEST_COMMAND} -R ${TEST_TARGET_NAME}
# Capturing lcov counters and generating report
- COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_BINARY_DIR}/coverage
- COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_BINARY_DIR}/coverage/${_testrunner}
- COMMAND ${LCOV_PATH} --directory ${SCAN_DIR} --capture
--output-file ${_outputname}.info
- COMMAND ${LCOV_PATH} --remove ${_outputname}.info '**/mock/*'
'**/test/*' '**/gtest/*' '**/tst/*' '**/celix/gen/*' '**/googletest_project/*'
'**/glog/*' '/usr/*' --output-file ${_outputname}.info.cleaned
+ COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_BINARY_DIR}/coverage
+ COMMAND ${LCOV_PATH} --directory ${COVERAGE_SCAN_DIR} --capture
--output-file ${OUTPUT_FILE}
+ COMMAND ${LCOV_PATH} --remove ${OUTPUT_FILE} '**/mock/*'
'**/test/*' '**/gtest/*' '**/tst/*' '**/celix/gen/*' '**/googletest_project/*'
'**/glog/*' '/usr/*' --output-file ${OUTPUT_FILE}.cleaned
+
+ #test dependencies, so that test is runned
+ DEPENDENCIES ${TEST_TARGET_NAME}
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
COMMENT "Resetting code coverage counters to zero.\nProcessing
code coverage counters and generating report."
)
- ADD_DEPENDENCIES(coverage ${_targetname}_coverage)
- ENDIF(ENABLE_CODE_COVERAGE)
-ENDFUNCTION() # SETUP_TARGET_FOR_COVERAGE
+ add_dependencies(coverage ${TEST_TARGET_NAME}_coverage)
+ endif ()
+endfunction ()
diff --git a/libs/dfi/gtest/CMakeLists.txt b/libs/dfi/gtest/CMakeLists.txt
index 22ef7e8..6fa6c71 100644
--- a/libs/dfi/gtest/CMakeLists.txt
+++ b/libs/dfi/gtest/CMakeLists.txt
@@ -38,5 +38,5 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/schemas DESTINATION
${CMAKE_CURRENT_BINARY_D
file(COPY ${CMAKE_CURRENT_LIST_DIR}/descriptors DESTINATION
${CMAKE_CURRENT_BINARY_DIR})
add_test(NAME run_test_dfi COMMAND test_dfi)
-SETUP_TARGET_FOR_COVERAGE(test_dfi_cov test_dfi
${CMAKE_BINARY_DIR}/coverage/test_dfi/test_dfi ..)
+setup_target_for_coverage(test_dfi SCAN_DIR ..)
diff --git a/libs/framework/CMakeLists.txt b/libs/framework/CMakeLists.txt
index c7f51ee..8849f49 100644
--- a/libs/framework/CMakeLists.txt
+++ b/libs/framework/CMakeLists.txt
@@ -320,25 +320,25 @@ if (ENABLE_TESTING)
# add_test(NAME service_tracker_test COMMAND service_tracker_test)
add_test(NAME wire_test COMMAND wire_test)
- SETUP_TARGET_FOR_COVERAGE(attribute_test attribute_test
${CMAKE_BINARY_DIR}/coverage/attribute_test/attribute_test)
-# SETUP_TARGET_FOR_COVERAGE(bundle_archive_test bundle_archive_test
${CMAKE_BINARY_DIR}/coverage/bundle_archive_test/bundle_archive_test)
- SETUP_TARGET_FOR_COVERAGE(bundle_cache_test bundle_cache_test
${CMAKE_BINARY_DIR}/coverage/bundle_cache_test/bundle_cache_test)
- SETUP_TARGET_FOR_COVERAGE(bundle_context_test bundle_context_test
${CMAKE_BINARY_DIR}/coverage/bundle_context_test/bundle_context_test)
- SETUP_TARGET_FOR_COVERAGE(bundle_revision_test bundle_revision_test
${CMAKE_BINARY_DIR}/coverage/bundle_revision_test/bundle_revision_test)
- SETUP_TARGET_FOR_COVERAGE(bundle_test bundle_test
${CMAKE_BINARY_DIR}/coverage/bundle_test/bundle_test)
- SETUP_TARGET_FOR_COVERAGE(capability_test capability_test
${CMAKE_BINARY_DIR}/coverage/capability_test/capability_test)
- SETUP_TARGET_FOR_COVERAGE(celix_errorcodes_test celix_errorcodes_test
${CMAKE_BINARY_DIR}/coverage/celix_errorcodes_test/celix_errorcodes_test)
- SETUP_TARGET_FOR_COVERAGE(framework_test framework_test
${CMAKE_BINARY_DIR}/coverage/framework_test/framework_test)
- SETUP_TARGET_FOR_COVERAGE(manifest_parser_test manifest_parser_test
${CMAKE_BINARY_DIR}/coverage/manifest_parser_test/manifest_parser_test)
- SETUP_TARGET_FOR_COVERAGE(manifest_test manifest_test
${CMAKE_BINARY_DIR}/coverage/manifest_test/manifest_test)
-# SETUP_TARGET_FOR_COVERAGE(module_test module_test
${CMAKE_BINARY_DIR}/coverage/module_test/module_test)
- SETUP_TARGET_FOR_COVERAGE(requirement_test requirement_test
${CMAKE_BINARY_DIR}/coverage/requirement_test/requirement_test)
-# SETUP_TARGET_FOR_COVERAGE(resolver_test resolver_test
${CMAKE_BINARY_DIR}/coverage/resolver_test/resolver_test)
- SETUP_TARGET_FOR_COVERAGE(service_reference_test service_reference_test
${CMAKE_BINARY_DIR}/coverage/service_reference_test/service_reference_test)
- SETUP_TARGET_FOR_COVERAGE(service_registration_test
service_registration_test
${CMAKE_BINARY_DIR}/coverage/service_registration_test/service_registration_test)
- SETUP_TARGET_FOR_COVERAGE(service_registry_test service_registry_test
${CMAKE_BINARY_DIR}/coverage/service_registry_test/service_registry_test)
- SETUP_TARGET_FOR_COVERAGE(service_tracker_customizer_test
service_tracker_customizer_test
${CMAKE_BINARY_DIR}/coverage/service_tracker_customizer_test/service_tracker_customizer_test)
-# SETUP_TARGET_FOR_COVERAGE(service_tracker_test service_tracker_test
${CMAKE_BINARY_DIR}/coverage/service_tracker_test/service_tracker_test)
- SETUP_TARGET_FOR_COVERAGE(wire_test wire_test
${CMAKE_BINARY_DIR}/coverage/wire_test/wire_test)
+ setup_target_for_coverage(attribute_test)
+# setup_target_for_coverage(bundle_archive_test)
+ setup_target_for_coverage(bundle_cache_test)
+ setup_target_for_coverage(bundle_context_test)
+ setup_target_for_coverage(bundle_revision_test)
+ setup_target_for_coverage(bundle_test bundle_test)
+ setup_target_for_coverage(capability_test)
+ setup_target_for_coverage(celix_errorcodes_test)
+ setup_target_for_coverage(framework_test)
+ setup_target_for_coverage(manifest_parser_test)
+ setup_target_for_coverage(manifest_test)
+# setup_target_for_coverage(module_test)
+ setup_target_for_coverage(requirement_test)
+# setup_target_for_coverage(resolver_test)
+ setup_target_for_coverage(service_reference_test)
+ setup_target_for_coverage(service_registration_test)
+ setup_target_for_coverage(service_registry_test)
+ setup_target_for_coverage(service_tracker_customizer_test)
+# setup_target_for_coverage(service_tracker_test)
+ setup_target_for_coverage(wire_test wire_test)
endif ()
diff --git a/libs/framework/gtest/CMakeLists.txt
b/libs/framework/gtest/CMakeLists.txt
index 33cb7b9..130eaf1 100644
--- a/libs/framework/gtest/CMakeLists.txt
+++ b/libs/framework/gtest/CMakeLists.txt
@@ -46,5 +46,5 @@ configure_file(framework1.properties.in framework1.properties
@ONLY)
configure_file(framework2.properties.in framework2.properties @ONLY)
add_test(NAME test_framework COMMAND test_framework)
-SETUP_TARGET_FOR_COVERAGE(test_framework_cov test_framework
${CMAKE_BINARY_DIR}/coverage/test_framework/test_framework ..)
+setup_target_for_coverage(test_framework SCAN_DIR ..)
diff --git a/libs/utils/CMakeLists.txt b/libs/utils/CMakeLists.txt
index 7cab36a..7e2cf45 100644
--- a/libs/utils/CMakeLists.txt
+++ b/libs/utils/CMakeLists.txt
@@ -132,15 +132,15 @@ if (ENABLE_TESTING)
add_test(NAME version_range_test COMMAND version_range_test)
add_test(NAME version_test COMMAND version_test)
- SETUP_TARGET_FOR_COVERAGE(array_list_test array_list_test
${CMAKE_BINARY_DIR}/coverage/array_list_test/array_list_test)
- SETUP_TARGET_FOR_COVERAGE(hash_map hash_map_test
${CMAKE_BINARY_DIR}/coverage/hash_map_test/hash_map_test)
- SETUP_TARGET_FOR_COVERAGE(celix_threads_test celix_threads_test
${CMAKE_BINARY_DIR}/coverage/celix_threads_test/celix_threads_test)
- #SETUP_TARGET_FOR_COVERAGE(thread_pool_test thread_pool_test
${CMAKE_BINARY_DIR}/coverage/thread_pool_test/thread_pool_test)
- SETUP_TARGET_FOR_COVERAGE(linked_list_test linked_list_test
${CMAKE_BINARY_DIR}/coverage/linked_list_test/linked_list_test)
- SETUP_TARGET_FOR_COVERAGE(properties_test properties_test
${CMAKE_BINARY_DIR}/coverage/properties_test/properties_test)
- SETUP_TARGET_FOR_COVERAGE(utils_test utils_test
${CMAKE_BINARY_DIR}/coverage/utils_test/utils_test)
- SETUP_TARGET_FOR_COVERAGE(ip_utils_test ip_utils_test
${CMAKE_BINARY_DIR}/coverage/ip_utils_test/ip_utils_test)
- SETUP_TARGET_FOR_COVERAGE(version_range_test version_range_test
${CMAKE_BINARY_DIR}/coverage/version_range_test/version_range_test)
- SETUP_TARGET_FOR_COVERAGE(version_test version_test
${CMAKE_BINARY_DIR}/coverage/version_test/version_test)
+ setup_target_for_coverage(array_list_test)
+ setup_target_for_coverage(hash_map_test)
+ setup_target_for_coverage(celix_threads_test)
+ #setup_target_for_coverage(thread_pool_test)
+ setup_target_for_coverage(linked_list_test)
+ setup_target_for_coverage(properties_test)
+ setup_target_for_coverage(utils_test)
+ setup_target_for_coverage(ip_utils_test)
+ setup_target_for_coverage(version_range_test)
+ setup_target_for_coverage(version_test)
endif ()
diff --git a/misc/experimental/bundles/config_admin/CMakeLists.txt
b/misc/experimental/bundles/config_admin/CMakeLists.txt
index 8a705c4..60a7f52 100644
--- a/misc/experimental/bundles/config_admin/CMakeLists.txt
+++ b/misc/experimental/bundles/config_admin/CMakeLists.txt
@@ -42,7 +42,7 @@ if (CONFIG_ADMIN)
#
#
# add_test(NAME run_config_admin_test COMMAND config_admin_test)
-# SETUP_TARGET_FOR_COVERAGE(config_admin_test config_admin_test
${CMAKE_BINARY_DIR}/coverage/config_admin_test/config_admin_test)
+# setup_target_for_coverage(config_admin_test config_admin_test
${CMAKE_BINARY_DIR}/coverage/config_admin_test/config_admin_test)
endif(ENABLE_TESTING)
diff --git
a/misc/experimental/bundles/config_admin/config_admin_tst/CMakeLists.txt
b/misc/experimental/bundles/config_admin/config_admin_tst/CMakeLists.txt
index f0abb8c..2d505cf 100644
--- a/misc/experimental/bundles/config_admin/config_admin_tst/CMakeLists.txt
+++ b/misc/experimental/bundles/config_admin/config_admin_tst/CMakeLists.txt
@@ -44,4 +44,4 @@ configure_file(config.properties.in config.properties @ONLY)
#ADD_TARGET_FOR_TEST(config_admin_test)
add_test(NAME run_config_admin_test COMMAND config_admin_test)
-SETUP_TARGET_FOR_COVERAGE(config_admin_test config_admin_test
${CMAKE_BINARY_DIR}/coverage/config_admin_test/config_admin_test)
+setup_target_for_coverage(config_admin_test)
