From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Jackson <ian.jackson@eu.citrix.com>
Subject: [OSSTEST PATCH 4/6] Other-revision-jobs: Update
	sg-report-flight and -job-history
Date: Fri, 28 Aug 2015 17:33:59 +0100
Message-ID: <1440779641-22477-4-git-send-email-ian.jackson@eu.citrix.com>
References: <1440779641-22477-1-git-send-email-ian.jackson@eu.citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta5.messagelabs.com ([195.245.231.135])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=675dd8bac=Ian.Jackson@citrix.com>)
	id 1ZVMbU-00038S-A0
	for xen-devel@lists.xenproject.org; Fri, 28 Aug 2015 16:34:12 +0000
In-Reply-To: <1440779641-22477-1-git-send-email-ian.jackson@eu.citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson <ian.jackson@eu.citrix.com>, Ian Campbell <ian.campbell@citrix.com>
List-Id: xen-devel@lists.xenproject.org

We need adjust only the regression analysis.

The other occurrences of special treatment for revision fields are for
reporting output, and are in the context of a specific job.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 sg-report-flight      |    4 ++++
 sg-report-job-history |    1 +
 2 files changed, 5 insertions(+)

diff --git a/sg-report-flight b/sg-report-flight
index 78c91da..a88379a 100755
--- a/sg-report-flight
+++ b/sg-report-flight
@@ -211,6 +211,7 @@ END
             SELECT flight, job, val FROM runvars
                 WHERE flight=?
 		  AND name=?
+                  AND ${\ main_revision_job_cond('job') }
 		GROUP BY flight, job, val
 END
     $revisionsq= db_prepare($revisionsq);
@@ -455,6 +456,9 @@ END
                   AND name like 'built_revision_%'
                 ORDER BY name
 END
+        # We report in jobtext revisions in non-main-revision jobs, too.
+        # (Although, at the time of writing this comment, the jobtexts
+        # seem not to ever be printed in the report...)
         $revh->execute();
         while (my $r= $revh->fetchrow_hashref()) {
             my $br= $r->{name};
diff --git a/sg-report-job-history b/sg-report-job-history
index 9a6e17b..0e2a3f9 100755
--- a/sg-report-job-history
+++ b/sg-report-job-history
@@ -93,6 +93,7 @@ our $revisionsq= db_prepare(<<END);
          WHERE flight=? AND job=?
            AND name LIKE E'built\\_revision\\_\%'
 END
+# (We report on non-main-revision jobs just as for main-revision ones.)
 
 sub add_revisions ($$$$) {
     my ($revmap, $flightnum, $j, $sfx) = @_;
-- 
1.7.10.4