d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Decrease verbosity, fix some configuration problems.

Browse Source
This commit is contained in:
des 2003-02-14 09:18:44 +00:00
parent 8a9c700ec3
commit 822010ed2f
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/tools/tinderbox/tbmaster.pl
View File

@ -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}

1
tools/tools/tinderbox/tinderbox.pl
View File

@ -338,7 +338,6 @@ MAIN:{
error("invalid log file name");
}
$logfile = $1;
logstage("logging to $logfile");
unlink($logfile);
open(STDOUT, '>', $logfile)
or error("$logfile: $!");