michaelh/zephyr
1
0
Fork 0
Code Releases Activity

tests: framework: fix code coverage report on zephyr-sdk-0.15

Browse source 
The GCC/GCOV version over 12 has slight format change of the gcno
and gcda. Make some adaption in the gcov dump function to fix the
code coverage report.

Mainly two places change:
1. Added the checksum in the struct gcov_info. This fix the crash
in qemu_x86, and mps2_an385 when run with --coverage.

2. Adjust the GCOV_TAG_FUNCTION_LENGTH accroding to gcov-io.h. It's
length unit is caculated by bytes now.

Fixes #50255.
Fixes #50257.

Signed-off-by: Enjia Mai <enjia.mai@intel.com>
This commit is contained in:
Enjia Mai 2022-09-21 17:26:25 +08:00 • committed by Fabio Baltieri
commit 77986382df
2 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
subsys/testsuite/coverage/coverage.c
View file

@ -73,8 +73,15 @@ size_t calculate_buff_size(struct gcov_info *info)
uint32_t iter;
uint32_t iter_1;
uint32_t iter_2;
/* few Fixed values at the start version, stamp and magic number. */
/* Few fixed values at the start: magic number,
* version, stamp, and checksum.
*/
#ifdef GCOV_12_FORMAT
uint32_t size = sizeof(uint32_t) * 4;
#else
uint32_t size = sizeof(uint32_t) * 3;
#endif
for (iter = 0U; iter < info->n_functions; iter++) {
/* space for TAG_FUNCTION and FUNCTION_LENGTH
@ -137,6 +144,12 @@ size_t populate_buffer(uint8_t *buffer, struct gcov_info *info)
&buffer_write_position,
info->stamp);
#ifdef GCOV_12_FORMAT
buff_write_u32(buffer,
&buffer_write_position,
info->checksum);
#endif
for (iter_functions = 0U;
iter_functions < info->n_functions;
iter_functions++) {
@ -178,9 +191,16 @@ size_t populate_buffer(uint8_t *buffer, struct gcov_info *info)
&buffer_write_position,
GCOV_TAG_FOR_COUNTER(iter_counts));
#ifdef GCOV_12_FORMAT
/* GCOV 12 counts the length by bytes */
buff_write_u32(buffer,
&buffer_write_position,
counters_per_func->num * 2U * 4);
#else
buff_write_u32(buffer,
&buffer_write_position,
counters_per_func->num * 2U);
#endif
for (iter_counter_values = 0U;
iter_counter_values < counters_per_func->num;