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 @members = $query->param('member');
map { s/[^a-zA-Z0-9_ -]//g; } @members;
-my $dsn="dbi:mysql:dbname=$dbname";
+my $dsn="dbi:Pg:dbname=$dbname";
$dsn .= ";host=$dbhost" if $dbhost;
$dsn .= ";port=$dbport" if $dbport;
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.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
;
next if (@members && ! grep {$_ eq $row->{sysname} } @members);
$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;
+ my $start;
+ 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})
+ {
+ push @ranges, sprintf("%s %s %s", $h->{$start}, $start, $i);
+ $start = $k;
+ $i = 1;
+ }
+ else
+ {
+ $i++;
+ }
+ }
+ else
+ {
+ $start = $k;
+ $i = 1;
+ }
}
- # 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/);
+ 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;