Skip to content

BaseTools/Plugin/HostBasedUnitTestRunner: Merge clang coverage files #11816

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −2
Open

BaseTools/Plugin/HostBasedUnitTestRunner: Merge clang coverage files #11816

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions BaseTools/Plugin/HostBasedUnitTestRunner/HostBasedUnitTestRunner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,13 +272,25 @@ def gen_code_coverage_clang(self, thebuilder):
if ret != 0:
logging.error("UnitTest Coverage: Failed generate filtered coverage XML.")
return 1
# Merge all XML files
# Merge package coverage XML files
ret = self.merge_cobertura_xml_files([f"{testFile}.coverage.xml" for testFile in testList], mergedCoverageXml)
if ret != 0:
logging.error("UnitTest Coverage: Failed to merge package coverage XML files.")
return 1

workspace = thebuilder.env.GetValue("WORKSPACE")
allCoverageXml = os.path.join(workspace, 'Build', 'coverage.xml')
testCoverageList = glob.glob(os.path.join(workspace, 'Build', "**", "*.coverage.xml"), recursive=True)

# Merge all coverage XML files
ret = self.merge_cobertura_xml_files(testCoverageList, allCoverageXml)
if ret != 0:
logging.error("UnitTest Coverage: Failed to merge coverage XML files.")
return 1

return 0


def merge_cobertura_xml_files(self, xml_file_list, output_file):
"""
Merge multiple Cobertura XML files into a single output file.
Expand Down Expand Up @@ -394,7 +406,7 @@ def gen_code_coverage_msvc(self, thebuilder):
logging.error("UnitTest Coverage: Failed to collect coverage data.")
return 1

# Generate and XML file if requested.by each package
# Generate and XML file if requested by each package
ret = RunCmd(
"OpenCppCoverage",
f"--export_type cobertura:{os.path.join(buildOutputBase, 'coverage.xml')} " +
Expand Down
Loading