Drop 4.next

[buildfarm-server.git] / cgi-bin / show_status.pl

diff --git a/cgi-bin/show_status.pl b/cgi-bin/show_status.pl
index c75b20e52f3acd73fc93a2c0eb02fcb2f720ccae..1ac959ebb5cc600fa90d17d80cd7d6829af69b61 100755 (executable)
--- a/cgi-bin/show_status.pl
+++ b/cgi-bin/show_status.pl
@@ -15,11 +15,11 @@ use CGI;
 
 use vars qw($dbhost $dbname $dbuser $dbpass $dbport $template_dir);
 
 
 use vars qw($dbhost $dbname $dbuser $dbpass $dbport $template_dir);
 

-
-require "$ENV{BFConfDir}/BuildFarmWeb.pl";
+use FindBin qw($RealBin);
+require "$RealBin/../BuildFarmWeb.pl";

 
 my $query = new CGI;
 
 my $query = new CGI;

-my @members = $query->param('member');
+my @members = $query->multi_param('member');

 map { s/[^a-zA-Z0-9_ -]//g; } @members;
 
 my $dsn="dbi:Pg:dbname=$dbname";
 map { s/[^a-zA-Z0-9_ -]//g; } @members;
 
 my $dsn="dbi:Pg:dbname=$dbname";


@@ -48,11 +48,16 @@ my $db = DBI->connect($dsn,$dbuser,$dbpass,{pg_expand_array => 0})
 my $statement =<<EOS;
 
 
 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 = 'HEAD' 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.sysname = s.sysname
+    AND 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
 ;
 
 EOS
 ;


@@ -60,26 +65,62 @@ EOS
 my $statrows=[];
 my $sth=$db->prepare($statement);
 $sth->execute;
 my $statrows=[];
 my $sth=$db->prepare($statement);
 $sth->execute;

+
+# walk the set of result rows from the SQL query above

 while (my $row = $sth->fetchrow_hashref)
 {
     next if (@members && ! grep {$_ eq $row->{sysname} } @members);
 while (my $row = $sth->fetchrow_hashref)
 {
     next if (@members && ! grep {$_ eq $row->{sysname} } @members);

+

     $row->{build_flags}  =~ s/^\{(.*)\}$/$1/;
     $row->{build_flags}  =~ s/,/ /g;
     $row->{build_flags}  =~ s/^\{(.*)\}$/$1/;
     $row->{build_flags}  =~ s/,/ /g;

-       # enable-integer-datetimes is now the default
-       if ($row->{branch} eq 'HEAD' || $row->{branch} gt 'REL8_3_STABLE')
+    $row->{build_flags}  =~ s/_PC\b//g;
+    $row->{build_flags} = lc($row->{build_flags});
+
+    if (defined($row->{log_text}))
+      {                # convert to a hash, find ranges, output list of ranges
+      my $h = { split /\s+/, $row->{log_text} };
+      my ($i, $start, $last);
+      my @ranges;
+
+      foreach my $k (sort {$a<=>$b} keys %$h)

        {
        {

-               $row->{build_flags} .= " --enable-integer-datetimes "
-                       unless ($row->{build_flags} =~ /--(en|dis)able-integer-datetimes/);
+       if (defined $start)
+         {
+         if ($h->{$k} ne $h->{$start} || $k != $last + 1)
+           {
+           # The result (skiped, Passed, Failed) for this testcase number
+           # is different to the start one of the range,
+           # or the range became non-contiguous.
+           # Add text for the range to list of ranges
+           # (these three elements get used by "status.tt" BLOCK colourbar)
+           # Reset the start and the count, for a new range.
+
+           push @ranges, sprintf("%s %s %s", $h->{$start},  $start,  $i);
+           $start = $k;
+           $i = 1;
+           }
+         else
+           {
+           # bump the size of this range
+           $i++;
+           }
+         }
+       else
+         {
+         # First ever range for this row
+         $start = $k;
+         $i = 1;
+         }
+       $last = $k;

        }
        }

-       # enable-thread-safety is now the default
-       if ($row->{branch} eq 'HEAD' || $row->{branch} gt 'REL8_5_STABLE')
+      if (defined $start)

        {
        {

-               $row->{build_flags} .= " --enable-thread-safety "
-                       unless ($row->{build_flags} =~ /--(en|dis)able-thread-safety/);
+       # close out the final range
+        push @ranges, sprintf("%s %s %s", $h->{$start},  $start,  $i);

        }
        }

-    $row->{build_flags}  =~ s/--((enable|with)-)?//g;
-       $row->{build_flags} =~ s/libxml/xml/;
-    $row->{build_flags}  =~ s/\S+=\S+//g;
+
+      $row->{log_text} = \@ranges;
+      }

     push(@$statrows,$row);
 }
 $sth->finish;
     push(@$statrows,$row);
 }
 $sth->finish;