diff options
| -rw-r--r-- | scripts/lib/build_perf/report.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/lib/build_perf/report.py b/scripts/lib/build_perf/report.py index ab77424cc7..a143b74653 100644 --- a/scripts/lib/build_perf/report.py +++ b/scripts/lib/build_perf/report.py | |||
| @@ -137,9 +137,12 @@ def results_xml_to_json(elem): | |||
| 137 | 137 | ||
| 138 | def aggregate_metadata(metadata): | 138 | def aggregate_metadata(metadata): |
| 139 | """Aggregate metadata into one, basically a sanity check""" | 139 | """Aggregate metadata into one, basically a sanity check""" |
| 140 | mutable_keys = ('pretty_name', 'version_id') | ||
| 141 | 140 | ||
| 142 | def aggregate_obj(aggregate, obj, assert_str=True): | 141 | # A given OE-Core commit may point at different meta-yocto/bitbake commits so we have |
| 142 | # to ignore commit/commit_count/commit_time differences | ||
| 143 | mutable_keys = ('pretty_name', 'version_id', 'commit', 'commit_count', 'commit_time') | ||
| 144 | |||
| 145 | def aggregate_obj(aggregate, obj, assert_obj=True): | ||
| 143 | """Aggregate objects together""" | 146 | """Aggregate objects together""" |
| 144 | assert type(aggregate) is type(obj), \ | 147 | assert type(aggregate) is type(obj), \ |
| 145 | "Type mismatch: {} != {}".format(type(aggregate), type(obj)) | 148 | "Type mismatch: {} != {}".format(type(aggregate), type(obj)) |
| @@ -151,7 +154,7 @@ def aggregate_metadata(metadata): | |||
| 151 | assert len(aggregate) == len(obj) | 154 | assert len(aggregate) == len(obj) |
| 152 | for i, val in enumerate(obj): | 155 | for i, val in enumerate(obj): |
| 153 | aggregate_obj(aggregate[i], val) | 156 | aggregate_obj(aggregate[i], val) |
| 154 | elif not isinstance(obj, str) or (isinstance(obj, str) and assert_str): | 157 | elif assert_obj: |
| 155 | assert aggregate == obj, "Data mismatch {} != {}".format(aggregate, obj) | 158 | assert aggregate == obj, "Data mismatch {} != {}".format(aggregate, obj) |
| 156 | 159 | ||
| 157 | if not metadata: | 160 | if not metadata: |
