From aed264cddd69f73c88dcc38087bcf034eb0edfc3 Mon Sep 17 00:00:00 2001 From: Saul Romero Date: Tue, 2 Apr 2024 10:20:51 +0000 Subject: [PATCH 1/2] code-coverage: Bugfix for branch coverage - Missing dash for this option on lcov. Signed-off-by: Saul Romero --- coverage-tool/coverage-reporting/merge.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coverage-tool/coverage-reporting/merge.py b/coverage-tool/coverage-reporting/merge.py index bb07b10..933f6de 100755 --- a/coverage-tool/coverage-reporting/merge.py +++ b/coverage-tool/coverage-reporting/merge.py @@ -197,7 +197,7 @@ if options.json_file and len(options.json_file): # Exploit LCOV merging capabilities # Example of LCOV usage: lcov -rc lcov_branch_coverage=1 -a coverage_1.info \ # -a coverage_2.info -o coverage_merge.info -command = ['lcov', '-rc', 'lcov_branch_coverage=1'] +command = ['lcov', '--rc', 'lcov_branch_coverage=1'] for file_name in info_files_to_merge: command.append('-a') -- GitLab From 2aad27e970a19882629dc1781117a59765e230ff Mon Sep 17 00:00:00 2001 From: Saul Romero Date: Wed, 1 May 2024 12:37:46 +0000 Subject: [PATCH 2/2] Update file intermediate_layer.py --- coverage-tool/coverage-reporting/intermediate_layer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coverage-tool/coverage-reporting/intermediate_layer.py b/coverage-tool/coverage-reporting/intermediate_layer.py index 1a851b8..55474b9 100644 --- a/coverage-tool/coverage-reporting/intermediate_layer.py +++ b/coverage-tool/coverage-reporting/intermediate_layer.py @@ -646,7 +646,8 @@ class IntermediateCodeCoverage(object): :param elf_filename: Elf binary file name """ command = "%s -Sl %s | tee %s" % (OBJDUMP, elf_filename, - elf_filename.replace(".elf", ".dump")) + elf_filename.replace(".elf", ".dump") \ + .replace(".axf", ".dump")) dump = os_command(command, show_command=True) dump += "\n\n" # For pattern matching the last function logger.info(f"Parsing assembly file {elf_filename}") -- GitLab