From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 9 Oct 2020 14:08:53 +0000 (+0100)
Subject: oe-build-perf-report: Ensure correct data is shown for multiple branch options
X-Git-Tag: 2020-10-gatesgarth~72
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=c263d810b7eb47ee90f2adeb5ab6decf7332bec2;p=openembedded-core.git

oe-build-perf-report: Ensure correct data is shown for multiple branch options

If --branch and --branch2 are the same, there is extra confusing data plotted
onto the graph. Only do that if the branches are actually different.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/scripts/oe-build-perf-report b/scripts/oe-build-perf-report
index b46d61869c..7812ea4540 100755
--- a/scripts/oe-build-perf-report
+++ b/scripts/oe-build-perf-report
@@ -509,7 +509,7 @@ def main(argv=None):
 
     revs = gitarchive.get_test_revs(log, repo, args.tag_name, hostname=args.hostname,
                                     branch=args.branch, machine=args.machine)
-    if args.branch2:
+    if args.branch2 and args.branch2 != args.branch:
         revs2 = gitarchive.get_test_revs(log, repo, args.tag_name, hostname=args.hostname,
                                          branch=args.branch2, machine=args.machine)
         if not len(revs2):
@@ -533,7 +533,7 @@ def main(argv=None):
     else:
         index1 = len(revs) - 1
 
-    if args.branch2:
+    if args.branch2 and args.branch2 != args.branch:
         revs2.append(revs[index1])
         index1 = len(revs2) - 1
         revs = revs2