Skip to content

handle combined lcov (concatenated lcov files) #48

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
Open

handle combined lcov (concatenated lcov files) #48

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
46 changes: 25 additions & 21 deletions lcov_cobertura/lcov_cobertura.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,34 +152,35 @@ def parse(self, **kwargs):
'classes': {}, 'lines-total': 0, 'lines-covered': 0,
'branches-total': 0, 'branches-covered': 0
}
coverage_data['packages'][package]['classes'][
relative_file_name] = {
'name': class_name, 'lines': {}, 'lines-total': 0,
'lines-covered': 0, 'branches-total': 0,
'branches-covered': 0
}
if relative_file_name not in coverage_data['packages'][package]['classes']:
coverage_data['packages'][package]['classes'][relative_file_name] = {
'name': class_name, 'lines': {}, 'lines-total': 0,
'lines-covered': 0, 'branches-total': 0,
'branches-covered': 0, 'methods': {}
}
package = package
current_file = relative_file_name
file_lines_total = 0
file_lines_covered = 0
file_lines.clear()
file_methods.clear()
file_branches_total = 0
file_branches_covered = 0
file_dict = coverage_data['packages'][package]['classes'][current_file]
file_lines_total = file_dict['lines-total']
file_lines_covered = file_dict['lines-covered']
file_lines = file_dict['lines']
file_methods = file_dict['methods']
file_branches_total = file_dict['branches-total']
file_branches_covered = file_dict['branches-covered']
elif input_type == 'DA':
# DA:2,0
(line_number, line_hits) = line_parts[-1].strip().split(',')[:2]
line_number = int(line_number)
if line_number not in file_lines:
file_lines[line_number] = {
'branch': 'false', 'branches-total': 0,
'branches-covered': 0
'branches-covered': 0, 'hits': 0
}
file_lines[line_number]['hits'] = line_hits
# Increment lines total/covered for class and package
try:
if int(line_hits) > 0:
file_lines_covered += 1
file_lines[line_number]['hits'] += int(line_hits)
except ValueError:
pass
file_lines_total += 1
Expand All @@ -205,13 +206,16 @@ def parse(self, **kwargs):
elif input_type == 'FN':
# FN:5,(anonymous_1)
function_line, function_name = line_parts[-1].strip().split(',', 1)
file_methods[function_name] = [function_line, '0']
if function_name not in file_methods:
file_methods[function_name] = [int(function_line), 0]
else:
file_methods[function_name][0] = int(function_line)
elif input_type == 'FNDA':
# FNDA:0,(anonymous_1)
(function_hits, function_name) = line_parts[-1].strip().split(',', 1)
if function_name not in file_methods:
file_methods[function_name] = ['0', '0']
file_methods[function_name][-1] = function_hits
file_methods[function_name] = [0, 0]
file_methods[function_name][-1] += int(function_hits)

# Exclude packages
excluded = [x for x in coverage_data['packages'] for e in self.excludes
Expand Down Expand Up @@ -293,13 +297,13 @@ def generate_cobertura_xml(self, coverage_data, **kwargs):
method_el = self._el(document, 'method', {
'name': self.format(method_name),
'signature': '',
'line-rate': '1.0' if int(hits) > 0 else '0.0',
'branch-rate': '1.0' if int(hits) > 0 else '0.0',
'line-rate': '1.0' if hits > 0 else '0.0',
'branch-rate': '1.0' if hits > 0 else '0.0',
})
method_lines_el = self._el(document, 'lines', {})
method_line_el = self._el(document, 'line', {
'hits': hits,
'number': line,
'hits': str(hits),
'number': str(line),
'branch': 'false',
})
method_lines_el.appendChild(method_line_el)
Expand Down