Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix support for multiple trees on quickparse.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@67541 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
slamm%netscape.com
2000-04-28 18:27:16 +00:00
parent ad9ed735c3
commit 76466123dc
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/webtools/tinderbox/showbuilds.cgi
View File

@@ -507,8 +507,10 @@ BEGIN {
my $checked_state = 0; my $checked_state = 0;
sub _check_tree_state { sub _check_tree_state {
my $tree = shift;
$checked_state = 1; $checked_state = 1;
tb_load_treedata(); tb_load_treedata($tree); # Loading for the global, $bonsai_tree
return unless defined $bonsai_tree and $bonsai_tree ne ''; return unless defined $bonsai_tree and $bonsai_tree ne '';
local $_; local $_;
@@ -518,7 +520,6 @@ BEGIN {
warn "No BatchID in ../bonsai/data/$bonsai_tree/batchid.pl\n"; warn "No BatchID in ../bonsai/data/$bonsai_tree/batchid.pl\n";
return; return;
} }
open(BATCH, "<../bonsai/data/$bonsai_tree/batch-$::BatchID.pl") open(BATCH, "<../bonsai/data/$bonsai_tree/batch-$::BatchID.pl")
or print "can't open batch-$::BatchID.pl<br>"; or print "can't open batch-$::BatchID.pl<br>";
while (<BATCH>) { while (<BATCH>) {
@@ -531,14 +532,18 @@ BEGIN {
} }
sub is_tree_state_available { sub is_tree_state_available {
my $tree = shift;
$tree = $::tree unless defined $tree;
return 1 if defined $treestate; return 1 if defined $treestate;
return 0 if $checked_state; return 0 if $checked_state;
_check_tree_state(); _check_tree_state($tree);
return is_tree_state_available(); return is_tree_state_available();
} }
sub is_tree_open { sub is_tree_open {
_check_tree_state() unless $checked_state; my $tree = shift;
$tree = $::tree unless defined $tree;
_check_tree_state($tree) unless $checked_state;
return $treestate; return $treestate;
} }
} }
@@ -879,13 +884,13 @@ sub do_quickparse {
print "Content-type: text/plain\n\n"; print "Content-type: text/plain\n\n";
my @treelist = split /,/, $::tree; my @treelist = split /,/, $::tree;
foreach my $t (@treelist) { foreach my $tt (@treelist) {
if (is_tree_state_available()) { if (is_tree_state_available($tt)) {
my $state = is_tree_open() ? 'open' : 'closed'; my $state = is_tree_open($tt) ? 'open' : 'closed';
print "State|$t|$bonsai_tree|$state\n"; print "State|$tt|$bonsai_tree|$state\n";
} }
my (%build, %times); my (%build, %times);
tb_loadquickparseinfo($t, \%build, \%times); tb_loadquickparseinfo($tt, \%build, \%times);
foreach my $buildname (sort keys %build) { foreach my $buildname (sort keys %build) {
print "Build|$t|$buildname|$build{$buildname}\n"; print "Build|$t|$buildname|$build{$buildname}\n";

4
mozilla/webtools/tinderbox/tbglobals.pl
View File

@@ -105,6 +105,8 @@ BEGIN {
my $have_loaded_treedata = 0; my $have_loaded_treedata = 0;
sub tb_load_treedata { sub tb_load_treedata {
my $tree = shift;
return if $have_loaded_treedata; return if $have_loaded_treedata;
$have_loaded_treedata = 1; $have_loaded_treedata = 1;
require "$tree/treedata.pl" if -r "$tree/treedata.pl"; require "$tree/treedata.pl" if -r "$tree/treedata.pl";
@@ -116,7 +118,7 @@ sub tb_load_data {
return undef unless $tree; return undef unless $tree;
tb_load_treedata(); tb_load_treedata($tree);
$ignore_builds = {}; $ignore_builds = {};