diff options
-rw-r--r-- | tools/tools/tinderbox/tbmaster.pl | 13 | ||||
-rw-r--r-- | tools/tools/tinderbox/tinderbox.pl | 1 |
2 files changed, 6 insertions, 8 deletions
diff --git a/tools/tools/tinderbox/tbmaster.pl b/tools/tools/tinderbox/tbmaster.pl index 65f6b3c..4aac3d3 100644 --- a/tools/tools/tinderbox/tbmaster.pl +++ b/tools/tools/tinderbox/tbmaster.pl @@ -36,7 +36,7 @@ my %CONFIGS = ( 'global' => { 'TBDIR' => '/home/des/tinderbox', 'OPTIONS' => [ '--update', '--verbose' ], - 'EMAIL' => 'developers,%%ARCH%%', + 'EMAIL' => 'des', }, # 5-CURRENT tinderbox 'cueball' => { @@ -103,7 +103,6 @@ sub tinderbox($$$$) { push(@args, "--logfile=$logfile"); push(@args, @{$CONFIG{'TARGETS'}}); - print(STDERR join(' ', @args), "\n"); rename($logfile, "$logfile.old"); if (system(@args) != 0) { my $messages = ""; @@ -114,7 +113,7 @@ sub tinderbox($$$$) { warn("$branch tinderbox failed for $arch/$machine\n"); if (open(LOGFILE, "<", $logfile)) { while (<LOGFILE>) { - if (m/^TB \*\*\*/) { + if (m/^TB ---/) { if (@accumulate && $error) { $messages .= join('', @accumulate); } @@ -150,12 +149,12 @@ sub tinderbox($$$$) { sub usage() { - print(STDERR "usage: tbmaster config\n"); - print(STDERR "recognized configs:"); + my @configs = (); foreach my $config (sort(keys(%CONFIGS))) { - print(STDERR " $config") + push(@configs, $config) unless ($config eq 'global'); } + print(STDERR "usage: tbmaster [", join('|', @configs), "]\n"); exit(1); } @@ -164,7 +163,7 @@ MAIN:{ unless (@ARGV == 1); my $config = lc($ARGV[0]); usage() - unless (exists($CONFIG{$config}) && $config ne 'global'); + unless (exists($CONFIGS{$config}) && $config ne 'global'); %CONFIG = %{$CONFIGS{$config}}; foreach my $key (keys(%{$CONFIGS{'global'}})) { $CONFIG{$key} = $CONFIGS{'global'}->{$key} diff --git a/tools/tools/tinderbox/tinderbox.pl b/tools/tools/tinderbox/tinderbox.pl index 2104f70..2baad7c 100644 --- a/tools/tools/tinderbox/tinderbox.pl +++ b/tools/tools/tinderbox/tinderbox.pl @@ -338,7 +338,6 @@ MAIN:{ error("invalid log file name"); } $logfile = $1; - logstage("logging to $logfile"); unlink($logfile); open(STDOUT, '>', $logfile) or error("$logfile: $!"); |