tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-28 16:14:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

BaseTools: Coverage: Detect lcov version

Browse Source 
Detect the version of lcov and only apply
version 2 workaround when needed.

Fixes 61c714285f8c

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
This commit is contained in:
Oliver Steffen 2024-12-04 12:10:53 +01:00 committed by mergify[bot]
parent 2940708eb2
commit 47ef197873
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
View File

@ -5,6 +5,8 @@
# SPDX-License-Identifier: BSD-2-Clause-Patent # SPDX-License-Identifier: BSD-2-Clause-Patent
# #
## ##
import io
import re
import os import os
import logging import logging
import glob import glob
@ -143,12 +145,28 @@ class HostBasedUnitTestRunner(IUefiBuildPlugin):
return failure_count return failure_count
def get_lcov_version(self):
"""Get lcov version number"""
lcov_ver = io.StringIO()
ret = RunCmd("lcov", "--version", outstream=lcov_ver)
if ret != 0:
return None
(major, _minor) = re.search(r"version (\d+)\.(\d+)", lcov_ver.getvalue()).groups()
return int(major)
def gen_code_coverage_gcc(self, thebuilder): def gen_code_coverage_gcc(self, thebuilder):
logging.info("Generating UnitTest code coverage") logging.info("Generating UnitTest code coverage")
buildOutputBase = thebuilder.env.GetValue("BUILD_OUTPUT_BASE") buildOutputBase = thebuilder.env.GetValue("BUILD_OUTPUT_BASE")
workspace = thebuilder.env.GetValue("WORKSPACE") workspace = thebuilder.env.GetValue("WORKSPACE")
lcov_version_major = self.get_lcov_version()
if not lcov_version_major:
logging.error("UnitTest Coverage: Failed to determine lcov version")
return 1
logging.info(f"Got lcov version {lcov_version_major}")
# Generate base code coverage for all source files # Generate base code coverage for all source files
ret = RunCmd("lcov", f"--no-external --capture --initial --directory {buildOutputBase} --output-file {buildOutputBase}/cov-base.info --rc lcov_branch_coverage=1") ret = RunCmd("lcov", f"--no-external --capture --initial --directory {buildOutputBase} --output-file {buildOutputBase}/cov-base.info --rc lcov_branch_coverage=1")
if ret != 0: if ret != 0:
@ -157,7 +175,8 @@ class HostBasedUnitTestRunner(IUefiBuildPlugin):
# Coverage data for tested files only # Coverage data for tested files only
# `--ignore-errors mismatch` needed to make lcov v2.0+/gcov work. # `--ignore-errors mismatch` needed to make lcov v2.0+/gcov work.
ret = RunCmd("lcov", f"--capture --directory {buildOutputBase}/ --output-file {buildOutputBase}/coverage-test.info --rc lcov_branch_coverage=1 --ignore-errors mismatch") lcov_error_settings = "--ignore-errors mismatch" if lcov_version_major >= 2 else ""
ret = RunCmd("lcov", f"--capture --directory {buildOutputBase}/ --output-file {buildOutputBase}/coverage-test.info --rc lcov_branch_coverage=1 {lcov_error_settings}")
if ret != 0: if ret != 0:
logging.error("UnitTest Coverage: Failed to build coverage data for tested files.") logging.error("UnitTest Coverage: Failed to build coverage data for tested files.")
return 1 return 1