From 2a4bd9ef5303717a102a7c1f958ae38541126d06 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Fri, 29 May 2020 08:33:34 -0400 Subject: [PATCH] small tweaks and documentation update to coverage cleaning targets --- cmake/Modules/CodeCoverage.cmake | 12 +++++++----- doc/src/Build_development.rst | 7 ++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/cmake/Modules/CodeCoverage.cmake b/cmake/Modules/CodeCoverage.cmake index 7413b62408..3b323e37ff 100644 --- a/cmake/Modules/CodeCoverage.cmake +++ b/cmake/Modules/CodeCoverage.cmake @@ -15,7 +15,7 @@ if(ENABLE_COVERAGE) gen_coverage_xml COMMAND ${GCOVR_BINARY} -s -x -r ${ABSOLUTE_LAMMPS_SOURCE_DIR} --object-directory=${CMAKE_BINARY_DIR} -o coverage.xml WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - COMMENT "Generating XML Coverage Report..." + COMMENT "Generating XML coverage report..." ) set(COVERAGE_HTML_DIR ${CMAKE_BINARY_DIR}/coverage_html) @@ -27,21 +27,23 @@ if(ENABLE_COVERAGE) gen_coverage_html COMMAND ${GCOVR_BINARY} -s --html --html-details -r ${ABSOLUTE_LAMMPS_SOURCE_DIR} --object-directory=${CMAKE_BINARY_DIR} -o ${COVERAGE_HTML_DIR}/index.html WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - COMMENT "Generating HTML Coverage Report..." + COMMENT "Generating HTML coverage report..." ) add_dependencies(gen_coverage_html coverage_html_folder) add_custom_target(clean_coverage_html ${CMAKE_COMMAND} -E remove_directory ${COVERAGE_HTML_DIR} + COMMENT "Deleting HTML coverage report..." ) - add_custom_target(reset_coverage + add_custom_target(reset_coverage ${CMAKE_COMMAND} -E remove -f */*.gcda */*/*.gcda */*/*/*.gcda */*/*/*/*.gcda */*/*/*/*/*.gcda */*/*/*/*/*/*.gcda */*/*/*/*/*/*/*.gcda */*/*/*/*/*/*/*/*.gcda */*/*/*/*/*/*/*/*/*.gcda */*/*/*/*/*/*/*/*/*/*.gcda WORKIND_DIRECTORY ${CMAKE_BINARY_DIR} - COMMENT "Deleting coverage report data files" - ) + COMMENT "Deleting coverage data files..." + ) + add_dependencies(reset_coverage clean_coverage_html) endif() endif() diff --git a/doc/src/Build_development.rst b/doc/src/Build_development.rst index 36f7f02d6d..94b78a4a9c 100644 --- a/doc/src/Build_development.rst +++ b/doc/src/Build_development.rst @@ -269,9 +269,10 @@ unit tests: .. code-block:: bash - make gen_coverage_html # generate coverage report in HTML format - make gen_coverage_xml # generate coverage report in XML format - make reset_coverage # delete all collected coverage data + make gen_coverage_html # generate coverage report in HTML format + make gen_coverage_xml # generate coverage report in XML format + make clean_coverage_html # delete folder with HTML format coverage report + make reset_coverage # delete all collected coverage data and HTML output These reports require `GCOVR `_ to be installed. The easiest way to do this to install it via pip: