Skip to content

Commit fe2003a

Browse files
hebastohebasto
committed
build: Add COMMAND_ERROR_IS_FATAL to every process in coverage scrips
1 parent f66011e commit fe2003a

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

‎cmake/script/Coverage.cmake

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,32 @@ execute_process(
2121
execute_process(
2222
COMMAND ${LCOV_COMMAND} --capture --directory src --test-name test_bitcoin --output-file test_bitcoin.info
2323
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
24+
COMMAND_ERROR_IS_FATAL ANY
2425
)
2526
execute_process(
2627
COMMAND ${LCOV_COMMAND} --zerocounters --directory src
2728
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
29+
COMMAND_ERROR_IS_FATAL ANY
2830
)
2931
execute_process(
3032
COMMAND ${LCOV_FILTER_COMMAND} test_bitcoin.info test_bitcoin_filtered.info
3133
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
34+
COMMAND_ERROR_IS_FATAL ANY
3235
)
3336
execute_process(
3437
COMMAND ${LCOV_COMMAND} --add-tracefile test_bitcoin_filtered.info --output-file test_bitcoin_filtered.info
3538
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
39+
COMMAND_ERROR_IS_FATAL ANY
3640
)
3741
execute_process(
3842
COMMAND ${LCOV_COMMAND} --add-tracefile baseline_filtered.info --add-tracefile test_bitcoin_filtered.info --output-file test_bitcoin_coverage.info
3943
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
44+
COMMAND_ERROR_IS_FATAL ANY
4045
)
4146
execute_process(
4247
COMMAND ${GENHTML_COMMAND} test_bitcoin_coverage.info --output-directory test_bitcoin.coverage
4348
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
49+
COMMAND_ERROR_IS_FATAL ANY
4450
)
4551

4652
execute_process(
@@ -51,27 +57,33 @@ execute_process(
5157
execute_process(
5258
COMMAND ${LCOV_COMMAND} --capture --directory src --test-name functional-tests --output-file functional_test.info
5359
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
60+
COMMAND_ERROR_IS_FATAL ANY
5461
)
5562
execute_process(
5663
COMMAND ${LCOV_COMMAND} --zerocounters --directory src
5764
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
65+
COMMAND_ERROR_IS_FATAL ANY
5866
)
5967
execute_process(
6068
COMMAND ${LCOV_FILTER_COMMAND} functional_test.info functional_test_filtered.info
6169
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
70+
COMMAND_ERROR_IS_FATAL ANY
6271
)
6372
execute_process(
6473
COMMAND ${LCOV_COMMAND} --add-tracefile functional_test_filtered.info --output-file functional_test_filtered.info
6574
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
75+
COMMAND_ERROR_IS_FATAL ANY
6676
)
6777
execute_process(
6878
COMMAND ${LCOV_COMMAND} --add-tracefile baseline_filtered.info --add-tracefile test_bitcoin_filtered.info --add-tracefile functional_test_filtered.info --output-file total_coverage.info
6979
COMMAND ${GREP_EXECUTABLE} "%"
7080
COMMAND ${AWK_EXECUTABLE} "{ print substr($3,2,50) \"/\" $5 }"
7181
OUTPUT_FILE coverage_percent.txt
7282
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
83+
COMMAND_ERROR_IS_FATAL ANY
7384
)
7485
execute_process(
7586
COMMAND ${GENHTML_COMMAND} total_coverage.info --output-directory total.coverage
7687
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
88+
COMMAND_ERROR_IS_FATAL ANY
7789
)

‎cmake/script/CoverageFuzz.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,33 @@ execute_process(
1616
execute_process(
1717
COMMAND ${LCOV_COMMAND} --capture --directory src --test-name fuzz-tests --output-file fuzz.info
1818
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
19+
COMMAND_ERROR_IS_FATAL ANY
1920
)
2021
execute_process(
2122
COMMAND ${LCOV_COMMAND} --zerocounters --directory src
2223
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
24+
COMMAND_ERROR_IS_FATAL ANY
2325
)
2426
execute_process(
2527
COMMAND ${LCOV_FILTER_COMMAND} fuzz.info fuzz_filtered.info
2628
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
29+
COMMAND_ERROR_IS_FATAL ANY
2730
)
2831
execute_process(
2932
COMMAND ${LCOV_COMMAND} --add-tracefile fuzz_filtered.info --output-file fuzz_filtered.info
3033
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
34+
COMMAND_ERROR_IS_FATAL ANY
3135
)
3236
execute_process(
3337
COMMAND ${LCOV_COMMAND} --add-tracefile baseline_filtered.info --add-tracefile fuzz_filtered.info --output-file fuzz_coverage.info
3438
COMMAND ${GREP_EXECUTABLE} "%"
3539
COMMAND ${AWK_EXECUTABLE} "{ print substr($3,2,50) \"/\" $5 }"
3640
OUTPUT_FILE coverage_percent.txt
3741
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
42+
COMMAND_ERROR_IS_FATAL ANY
3843
)
3944
execute_process(
4045
COMMAND ${GENHTML_COMMAND} fuzz_coverage.info --output-directory fuzz.coverage
4146
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
47+
COMMAND_ERROR_IS_FATAL ANY
4248
)

‎cmake/script/CoverageInclude.cmake.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,15 @@ list(APPEND LCOV_FILTER_COMMAND -p "depends")
4545
execute_process(
4646
COMMAND ${LCOV_COMMAND} --capture --initial --directory src --output-file baseline.info
4747
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
48+
COMMAND_ERROR_IS_FATAL ANY
4849
)
4950
execute_process(
5051
COMMAND ${LCOV_FILTER_COMMAND} baseline.info baseline_filtered.info
5152
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
53+
COMMAND_ERROR_IS_FATAL ANY
5254
)
5355
execute_process(
5456
COMMAND ${LCOV_COMMAND} --add-tracefile baseline_filtered.info --output-file baseline_filtered.info
5557
WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}
58+
COMMAND_ERROR_IS_FATAL ANY
5659
)

0 commit comments

Comments
 (0)