Skip to content

Make sure cleanup runs before the tests #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikeferguson merged 1 commit into from
Jun 22, 2022
Merged

Make sure cleanup runs before the tests #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmake/Modules/CodeCoverage.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ function(ADD_CODE_COVERAGE)
add_custom_target(${Coverage_NAME}_cleanup_cpp
# Cleanup lcov
COMMAND ${LCOV_PATH} --directory . --zerocounters
# Create baseline to make sure untouched files show up in the report
COMMAND ${LCOV_PATH} -c -i -d . -o ${PROJECT_BINARY_DIR}/${Coverage_NAME}.base
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
DEPENDS ${Coverage_DEPENDENCIES}
COMMENT "Resetting CPP code coverage counters to zero."
Expand All @@ -162,13 +160,15 @@ function(ADD_CODE_COVERAGE)
COMMENT "Resetting PYTHON code coverage counters to zero."
)

# Cleanup before we run tests
add_dependencies(_run_tests_${PROJECT_NAME} ${Coverage_NAME}_cleanup_cpp)
add_dependencies(_run_tests_${PROJECT_NAME} ${Coverage_NAME}_cleanup_py)
# Cleanup before we run tests (attach to the tests target, which is completed before any test is run)
add_dependencies(tests ${Coverage_NAME}_cleanup_cpp)
add_dependencies(tests ${Coverage_NAME}_cleanup_py)

# Create C++ coverage report
add_custom_target(${Coverage_NAME}_cpp
COMMAND export PYTHONIOENCODING=UTF-8
# Create baseline to make sure untouched files show up in the report
COMMAND ${LCOV_PATH} -c -i -d . -o ${PROJECT_BINARY_DIR}/${Coverage_NAME}.base
# Capturing lcov counters and generating report
COMMAND ${LCOV_PATH} --directory . --capture --output-file ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info
# add baseline counters
Expand Down