From 599fe50a488d94ec6e7ac18b5a7e56ee3f67ce87 Mon Sep 17 00:00:00 2001 From: Zane Reynolds Date: Fri, 12 Oct 2018 13:43:23 -0400 Subject: [PATCH] for some reason the cwd changes during the llvm-cov/gcov runs, so switched to absolute path --- CMakeModules/EosioTesterBuild.cmake.in | 2 +- tests/CMakeLists.txt | 2 +- unittests/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in index 2c650def39c..be26054cc57 100644 --- a/CMakeModules/EosioTesterBuild.cmake.in +++ b/CMakeModules/EosioTesterBuild.cmake.in @@ -173,7 +173,7 @@ if(ENABLE_COVERAGE_TESTING) # Run tests COMMAND ./tools/ctestwrapper.sh -R ${ctest_tests} -E ${ctest_exclude_tests} - COMMAND ${LCOV_PATH} --directory . --capture --gcov-tool ./tools/llvm-gcov.sh --output-file ${Coverage_NAME}.info + COMMAND ${LCOV_PATH} --directory . --capture --gcov-tool ${CMAKE_SOURCE_DIR}/tools/llvm-gcov.sh --output-file ${Coverage_NAME}.info COMMAND ${LCOV_PATH} -remove ${Coverage_NAME}.info '*/boost/*' '/usr/lib/*' '/usr/include/*' '*/externals/*' '*/fc/*' '*/wasm-jit/*' --output-file ${Coverage_NAME}_filtered.info diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cc9eec4e538..80e17845781 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -128,7 +128,7 @@ if(ENABLE_COVERAGE_TESTING) COMMAND ctest -R ${ctest_tests} -E ${ctest_exclude_tests} COMMENT "Capturing lcov counters and generating report" - COMMAND ${LCOV_PATH} --directory . --capture --gcov-tool ./tools/llvm-gcov.sh --output-file ${Coverage_NAME}.info + COMMAND ${LCOV_PATH} --directory . --capture --gcov-tool ${CMAKE_SOURCE_DIR}/tools/llvm-gcov.sh --output-file ${Coverage_NAME}.info COMMENT "Processing code coverage counters and generating report." COMMAND ${GENHTML_PATH} -o ${Coverage_NAME} ${PROJECT_BINARY_DIR}/${Coverage_NAME}.info diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index c21c9597312..a57e1cb9ed7 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -68,7 +68,7 @@ if(ENABLE_COVERAGE_TESTING) # Run tests COMMAND ./tools/ctestwrapper.sh -R ${ctest_tests} -E ${ctest_exclude_tests} - COMMAND ${LCOV_PATH} --directory . --capture --gcov-tool ./tools/llvm-gcov.sh --output-file ${Coverage_NAME}.info + COMMAND ${LCOV_PATH} --directory . --capture --gcov-tool ${CMAKE_SOURCE_DIR}/tools/llvm-gcov.sh --output-file ${Coverage_NAME}.info COMMAND ${LCOV_PATH} -remove ${Coverage_NAME}.info '*/boost/*' '/usr/lib/*' '/usr/include/*' '*/externals/*' '*/fc/*' '*/wasm-jit/*' --output-file ${Coverage_NAME}_filtered.info