[gnome-continuous-yocto/gnomeostree-3.28-rocko: 204/218] scripts/oe-build-perf-report: fix comparing arbitrary commits



commit 3fae046acfda2848de77268b05ac3601417fc8ca
Author: Markus Lehtonen <markus lehtonen linux intel com>
Date:   Thu Mar 15 14:40:45 2018 +0200

    scripts/oe-build-perf-report: fix comparing arbitrary commits
    
    Fix a crash when generating a txt report and the two commits to be
    compared were not consecutive (but there were some tested commits
    between them).
    
    (From OE-Core rev: f3afd2c47f4c740df52dfd80e208ce721d5ebf6e)
    
    (From OE-Core rev: 00b197b2fb2253f2c5c534b16cc2d3d55aad6352)
    
    Signed-off-by: Markus Lehtonen <markus lehtonen linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/oe-build-perf-report |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)
---
diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report
index ac88f0f..dc999c4 100755
--- a/scripts/oe-build-perf-report
+++ b/scripts/oe-build-perf-report
@@ -639,10 +639,6 @@ def main(argv=None):
         data.append(AggregateTestData(aggregate_metadata(raw_m),
                                       aggregate_data(raw_d)))
 
-    # Re-map list indexes to the new table starting from index 0
-    index_r = index_r - index_0
-    index_l = index_l - index_0
-
     # Read buildstats only when needed
     buildstats = None
     if args.dump_buildstats or args.html:
@@ -653,10 +649,11 @@ def main(argv=None):
 
     # Print report
     if not args.html:
-        print_diff_report(data[index_l].metadata, data[index_l].results,
-                          data[index_r].metadata, data[index_r].results)
+        print_diff_report(data[0].metadata, data[0].results,
+                          data[1].metadata, data[1].results)
     else:
-        print_html_report(data, index_l, buildstats)
+        # Re-map 'left' list index to the data table where index_0 maps to 0
+        print_html_report(data, index_l - index_0, buildstats)
 
     return 0
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]