Skip to content

Commit 55cf39e

Browse files
committed
Merge bitcoin/bitcoin#31722: cmake: Copy cov_tool_wrapper.sh.in to the build tree
e3c0152 cmake: Copy `cov_tool_wrapper.sh.in` to the build tree (Hennadii Stepanov) Pull request description: This PR ensures that `cov_tool_wrapper.sh.in` is available when invoking the `Coverage.cmake` script from any directory. Here is an example of usage on Ubuntu 24.10 with the default GCC 14.2.0: ``` $ cmake -B build -DCMAKE_BUILD_TYPE=Coverage -DCMAKE_CXX_FLAGS="-fprofile-update=atomic" -DCMAKE_C_FLAGS="-fprofile-update=atomic" $ cmake --build build -j $(nproc) $ cd .. $ cmake -DJOBS=$(nproc) -DLCOV_OPTS="--ignore-errors inconsistent,inconsistent" -P bitcoin/build/Coverage.cmake ``` Fixes bitcoin/bitcoin#31638. ACKs for top commit: theuni: utACK e3c0152 Tree-SHA512: ccfc8e893567f199d9b05ea3916cac06fca89c5892cc7492d5251c331c35408222fd918ed08017515e2dfca10970ae3f633b3917bfb7037db539559e71d7f711
2 parents 048ef98 + e3c0152 commit 55cf39e

File tree

3 files changed

+2
-1
lines changed

3 files changed

+2
-1
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@ endif()
458458
configure_file(cmake/script/Coverage.cmake Coverage.cmake USE_SOURCE_PERMISSIONS COPYONLY)
459459
configure_file(cmake/script/CoverageFuzz.cmake CoverageFuzz.cmake USE_SOURCE_PERMISSIONS COPYONLY)
460460
configure_file(cmake/script/CoverageInclude.cmake.in CoverageInclude.cmake USE_SOURCE_PERMISSIONS @ONLY)
461+
configure_file(cmake/script/cov_tool_wrapper.sh.in cov_tool_wrapper.sh.in USE_SOURCE_PERMISSIONS COPYONLY)
461462
configure_file(contrib/filter-lcov.py filter-lcov.py USE_SOURCE_PERMISSIONS COPYONLY)
462463

463464
# Don't allow extended (non-ASCII) symbols in identifiers. This is easier for code review.

cmake/script/CoverageInclude.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ endif()
1212

1313
# COV_TOOL is used to replace a placeholder.
1414
configure_file(
15-
cmake/cov_tool_wrapper.sh.in ${CMAKE_CURRENT_LIST_DIR}/cov_tool_wrapper.sh
15+
${CMAKE_CURRENT_LIST_DIR}/cov_tool_wrapper.sh.in ${CMAKE_CURRENT_LIST_DIR}/cov_tool_wrapper.sh
1616
FILE_PERMISSIONS OWNER_READ OWNER_EXECUTE
1717
GROUP_READ GROUP_EXECUTE
1818
WORLD_READ
File renamed without changes.

0 commit comments

Comments
 (0)