Commit 5e2058f7 authored by Max Moroz's avatar Max Moroz Committed by Commit Bot

[Code Coverage] Fix handling of src_root_dir (now it works even with "/").

TBR=inferno@chromium.org,liaoyuke@chromium.org

Bug: 817798,866943
Change-Id: Ibbd8117a8adc656defefaa776f6983dde9a13a4f
Reviewed-on: https://chromium-review.googlesource.com/1186544Reviewed-by: default avatarMax Moroz <mmoroz@chromium.org>
Commit-Queue: Max Moroz <mmoroz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585487}
parent 3889cfb9
...@@ -242,7 +242,9 @@ class CoverageReportPostProcessor(object): ...@@ -242,7 +242,9 @@ class CoverageReportPostProcessor(object):
"""Initializes CoverageReportPostProcessor object.""" """Initializes CoverageReportPostProcessor object."""
# Caller provided parameters. # Caller provided parameters.
self.output_dir = output_dir self.output_dir = output_dir
self.src_root_dir = src_root_dir.rstrip(os.sep) self.src_root_dir = os.path.normpath(GetFullPath(src_root_dir))
if not self.src_root_dir.endswith(os.sep):
self.src_root_dir += os.sep
self.summary_data = json.loads(summary_data) self.summary_data = json.loads(summary_data)
assert len(self.summary_data['data']) == 1 assert len(self.summary_data['data']) == 1
self.no_component_view = no_component_view self.no_component_view = no_component_view
...@@ -318,7 +320,7 @@ class CoverageReportPostProcessor(object): ...@@ -318,7 +320,7 @@ class CoverageReportPostProcessor(object):
while True: while True:
per_directory_coverage_summary[parent_dir].AddSummary(summary) per_directory_coverage_summary[parent_dir].AddSummary(summary)
if parent_dir == self.src_root_dir: if os.path.normpath(parent_dir) == os.path.normpath(self.src_root_dir):
break break
parent_dir = os.path.dirname(parent_dir) parent_dir = os.path.dirname(parent_dir)
...@@ -457,7 +459,7 @@ class CoverageReportPostProcessor(object): ...@@ -457,7 +459,7 @@ class CoverageReportPostProcessor(object):
per_file_coverage_summary = {} per_file_coverage_summary = {}
for file_coverage_data in files_coverage_data: for file_coverage_data in files_coverage_data:
file_path = file_coverage_data['filename'] file_path = file_coverage_data['filename']
assert file_path.startswith(self.src_root_dir + os.sep), ( assert file_path.startswith(self.src_root_dir), (
'File path "%s" in coverage summary is outside source checkout.' % 'File path "%s" in coverage summary is outside source checkout.' %
file_path) file_path)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment