diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2016-12-25 12:13:08 +0100 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2016-12-25 12:13:08 +0100 |
| commit | 8b2f747f4369dca11b9703c3033c05672bc724ec (patch) | |
| tree | 3f7e915023472a4ddb7c32ca3ec27696519c0ab5 | |
| parent | 36558df753f0142cac5b8066072f86739785655f (diff) | |
| download | extfs-8b2f747f4369dca11b9703c3033c05672bc724ec.tar.xz extfs-8b2f747f4369dca11b9703c3033c05672bc724ec.zip | |
coverage: Remove path normalization
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | cmake/modules/CodeCoverage.cmake | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 34355da..8e1143b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -94,4 +94,5 @@ script: - if [ "$BUILD_TYPE" == "Coverage" ]; then cmake --build . --target extfs_coverage; fi after_success: + - if [ "$BUILD_TYPE" == "Coverage" ]; then sed -i'' -e "s_$(cd .. && pwd)__g" coverage.info.cleaned; fi - if [ "$BUILD_TYPE" == "Coverage" ]; then coveralls-lcov --repo-token ${COVERALLS_API_TOKEN} coverage.info.cleaned; fi diff --git a/cmake/modules/CodeCoverage.cmake b/cmake/modules/CodeCoverage.cmake index 80c8ee0..7612f93 100644 --- a/cmake/modules/CodeCoverage.cmake +++ b/cmake/modules/CodeCoverage.cmake @@ -138,11 +138,6 @@ function(add_coverage TARGET_NAME) COMMENT "[CodeCoverage] Extracting project relevant data ..." ) - add_custom_command(TARGET ${TARGET_NAME} POST_BUILD - COMMAND sed -i'' -e 's_${PROJECT_SOURCE_DIR}/__g' ${COVERAGE_CLEANED} - COMMENT "[CodeCoverage] Normalizing paths ..." - ) - if(ADD_COVERAGE_HTML_REPORT) find_program(GENHTML_PATH genhtml) if(NOT GENHTML_PATH) @@ -151,10 +146,9 @@ function(add_coverage TARGET_NAME) add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND ${GENHTML_PATH} --rc 'lcov_branch_coverage=1' - -o ${CMAKE_BINARY_DIR}/${ADD_COVERAGE_OUTPUT} + -o ${ADD_COVERAGE_OUTPUT} ${COVERAGE_CLEANED} ${ADD_COVERAGE_QUIET} - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} COMMENT "[CodeCoverage] Generating HTML report ..." ) |