Include the config name in the log file name.

This commit is contained in:
Dag-Erling Smørgrav 2004-06-12 11:22:21 +00:00
parent 5321c2a9b0
commit 640d785fc9
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=130375

View File

@ -199,6 +199,7 @@ sub tinderbox($$$) {
my $arch = shift; my $arch = shift;
my $machine = shift; my $machine = shift;
my $config = expand('CONFIG');
my $start = time(); my $start = time();
$CONFIG{'BRANCH'} = $branch; $CONFIG{'BRANCH'} = $branch;
@ -206,7 +207,8 @@ sub tinderbox($$$) {
$CONFIG{'MACHINE'} = $machine; $CONFIG{'MACHINE'} = $machine;
# Open log files: one for the full log and one for the summary # Open log files: one for the full log and one for the summary
my $logfile = expand('LOGDIR') . "/tinderbox-$branch-$arch-$machine"; my $logfile = expand('LOGDIR') .
"/tinderbox-$config-$branch-$arch-$machine";
local (*FULL, *BRIEF); local (*FULL, *BRIEF);
if (!open(FULL, ">", "$logfile.full.$$")) { if (!open(FULL, ">", "$logfile.full.$$")) {
warn("$logfile.full.$$: $!\n"); warn("$logfile.full.$$: $!\n");
@ -461,6 +463,11 @@ MAIN:{
chdir($etcdir) chdir($etcdir)
or die("$etcdir: $!\n"); or die("$etcdir: $!\n");
} }
for (my $n = 0; $n < @configs; ++$n) {
$configs[$n] =~ m/^(\w+)$/
or die("invalid config: $configs[$n]\n");
$configs[$n] = $1;
}
# Run all specified or implied configurations # Run all specified or implied configurations
foreach my $config (@configs) { foreach my $config (@configs) {