From a30f4fdc1b6d0b503014736074783ee53ed15d32 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh@wizmail.org>
Date: Mon, 28 Nov 2016 17:40:14 +0000
Subject: [PATCH] Add testcases detail column to status page

---
 cgi-bin/show_status.pl   |  17 ++++++++++++-----
 htdocs/img/t_fail.gif    | Bin 0 -> 37 bytes
 htdocs/img/t_good.gif    | Bin 0 -> 37 bytes
 htdocs/img/t_notdone.gif | Bin 0 -> 37 bytes
 templates/log.tt         |   4 ++--
 templates/status.tt      |  14 ++++++++++++--
 6 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 htdocs/img/t_fail.gif
 create mode 100644 htdocs/img/t_good.gif
 create mode 100644 htdocs/img/t_notdone.gif

diff --git a/cgi-bin/show_status.pl b/cgi-bin/show_status.pl
index f371bdc..baf9623 100755
--- a/cgi-bin/show_status.pl
+++ b/cgi-bin/show_status.pl
@@ -48,11 +48,14 @@ my $db = DBI->connect($dsn,$dbuser,$dbpass,{pg_expand_array => 0})
 my $statement =<<EOS;
 
 
-  select timezone('GMT'::text, now())::timestamp(0) without time zone - b.snapshot AS when_ago, b.*
-  from dashboard_mat b
-  order by branch = 'master' desc,
-        branch desc, $sort_clause 
-        snapshot desc
+  SELECT timezone('GMT'::text, now())::timestamp(0) without time zone - b.snapshot AS when_ago,
+	b.*,
+	s.log_text
+  FROM dashboard_mat b LEFT JOIN build_status_log s
+  ON b.snapshot = s.snapshot AND s.log_stage = 'test-results.log'
+  ORDER BY b.branch = 'master' desc,
+        b.branch desc, $sort_clause 
+        b.snapshot desc
 
 EOS
 ;
@@ -67,6 +70,10 @@ while (my $row = $sth->fetchrow_hashref)
     $row->{build_flags}  =~ s/,/ /g;
     $row->{build_flags}  =~ s/_PC\b//g;
     $row->{build_flags} = lc($row->{build_flags});
+    if (defined($row->{log_text}))
+      {		# convert to a hash
+      $row->{log_text} = { split /\s+/, $row->{log_text} };
+      }
     push(@$statrows,$row);
 }
 $sth->finish;
diff --git a/htdocs/img/t_fail.gif b/htdocs/img/t_fail.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e3030bc110cafaab7c0bd5bae4a042124789ccec
GIT binary patch
literal 37
pcmZ?wbh9u|WMmLvXkcXc&%p5i|9>3@AOMLlFtN1sbFwm60|2IM2h;!n

literal 0
HcmV?d00001

diff --git a/htdocs/img/t_good.gif b/htdocs/img/t_good.gif
new file mode 100644
index 0000000000000000000000000000000000000000..f8ddab0c91320b32c14e84e586bc878d43bfc31d
GIT binary patch
literal 37
pcmZ?wbh9u|WMmLvXkcVu`@Q!6|NlA+KmZb9U}9<M=VWED1^~2w2!j9s

literal 0
HcmV?d00001

diff --git a/htdocs/img/t_notdone.gif b/htdocs/img/t_notdone.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7ac2089e48a862c25958d9d03c37e3e315a6393a
GIT binary patch
literal 37
lcmZ?wbh9u|WMmLvXkcLY4+c66KmZb9U}9<M=VWED1_09~3DE!m

literal 0
HcmV?d00001

diff --git a/templates/log.tt b/templates/log.tt
index 2233397..e2ceffd 100644
--- a/templates/log.tt
+++ b/templates/log.tt
@@ -133,9 +133,9 @@ not recorded
 [% IF changed_since_success_logs.0 %]
 <h5>Git log</h5>
 <pre>
-<a href="https://github.com/postgres/postgres/compare/[% last_success_git_ref %]...[% last_build_git_ref %]">Change Set prior to this build</a>
+<a href="https://github.com/Exim/exim/compare/[% last_success_git_ref %]...[% last_build_git_ref %]">Change Set prior to this build</a>
 
-<a href="https://github.com/postgres/postgres/compare/[% last_success_git_ref %]...[% git_head_ref %]">Change Set including this build</a>
+<a href="https://github.com/Exim/exim/compare/[% last_success_git_ref %]...[% git_head_ref %]">Change Set including this build</a>
 
 [% FOREACH clog IN changed_since_success_logs ; PROCESS gitlog -%]
 [%- END -%]
diff --git a/templates/status.tt b/templates/status.tt
index f471f2a..f861f9b 100644
--- a/templates/status.tt
+++ b/templates/status.tt
@@ -29,6 +29,13 @@ See accompanying License file for license details
      #'integer-datetimes' => '/img/days.png',
      }
 -%]
+[%
+ res_imgs = {
+     P = '/img/t_good.gif',
+     F => '/img/t_fail.gif',
+     '.' => '/img/t_notdone.gif',
+     }
+-%]
 [%- BLOCK img ; IF flag == 'depend' or flag == 'gnu-ld' ; ; ELSIF flag_imgs.$flag %]<img src="[% flag_imgs.$flag %]" title="[% flag %]" alt="[% flag %]" height="16" width="16" class="inline" align="bottom" />  [% ELSE %][%#
 																									  flag ; ' '
 %][% END ; END -%]
@@ -37,6 +44,8 @@ See accompanying License file for license details
 [%- BLOCK cl %] class="[% SWITCH bgfor.replace('-.*','') -%]
   [%- CASE 'OK' %]pass[% CASE 'ContribCheck' %]warn[% CASE [ 'Check' 'InstallCheck' ] %]warnx[% CASE %]fail[% END %]"
 [%- END -%]
+[%# The IF-backstop is ugly and I'm not understanding why the res_img lookup does not for for '.' -%]
+[%- BLOCK test_result %]<img src="[% IF res_imgs.$r.defined ; res_imgs.$r ; ELSE %]/img/t_notdone.gif [% END %]" title="[% test %]" alt="[% r %]" height="16" width="1" class="inline" align="bottom" />[%- END -%]
 [% WRAPPER 'page.tt' 
 	title = 'Exim BuildFarm Status'
 	bodyclass = 'none'
@@ -62,8 +71,8 @@ See accompanying License file for license details
 [% brch = "" %]
 [% FOREACH row IN statrows %]
 [% IF row.branch != brch ; brch = row.branch %]
-<tr><th class="head" colspan="5">Branch: [% brch %]</th></tr>
-<tr><th colspan="2">Alias</th><th>System</th><th>Status</th><th>Flags</th></tr>
+<tr><th class="head" colspan="6">Branch: [% brch %]</th></tr>
+<tr><th colspan="2">Alias</th><th>System</th><th>Status</th><th>Flags</th><th>Detail</th></tr>
 [% END %]
 <tr [% PROCESS cl bgfor=row.stage %]>
     <td><a 
@@ -86,6 +95,7 @@ See accompanying License file for license details
                 [%- IF row.stage != 'OK' %]Details[% ELSE %]Config[% END -%]</a></td>
 
     <td class="flags">[% FOREACH flag IN row.build_flags.split().sort() ; PROCESS img ; END %]</td>
+    <td class="tests">[% FOREACH test IN row.log_text.keys.nsort ; r = row.log_text.$test ; PROCESS test_result ; END %]</td>
 </tr>
 [% END %]
     </table>
-- 
2.30.2