Ensure all the necessary keys are present before parsing JSON data (#380)

This prevents errors when additional non-timing data are present in the JSON that is loaded, for example when complexity data has been computed (see #379).

Ensure all the necessary keys are present before parsing JSON data (#380)
feb69ae7 · Felix Duvallet · Dominic Hamon · 3336ea00 · feb69ae7
Commit feb69ae7 authored May 02, 2017 by Felix Duvallet Committed by Dominic Hamon May 02, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

report.py tools/gbench/report.py +3 -1

No files found.
--- a/tools/gbench/report.py
+++ b/tools/gbench/report.py
@@ -80,7 +80,9 @@ def generate_difference_report(json1, json2, use_color=True):
    first_line = "{:<{}s}     Time           CPU           Old           New".format(
        'Benchmark', first_col_width)
    output_strs = [first_line, '-' * len(first_line)]
-    for bn in json1['benchmarks']:
+
+    gen = (bn for bn in json1['benchmarks'] if 'real_time' in bn and 'cpu_time' in bn)
+    for bn in gen:
        other_bench = find_test(bn['name'])
        if not other_bench:
            continue