Bug 369801: Tinderboxen should output what config file they're using; let's see how this breaks the build farm. r=rhelmer

This commit is contained in:
preed%mozilla.com 2007-02-09 02:19:18 +00:00
Родитель 5b5ea527c2
Коммит e1f148d1d1
1 изменённых файлов: 28 добавлений и 1 удалений

Просмотреть файл

@ -24,7 +24,7 @@ use Config; # for $Config{sig_name} and $Config{sig_num}
use File::Find (); use File::Find ();
use File::Copy; use File::Copy;
$::UtilsVersion = '$Revision: 1.350 $ '; $::UtilsVersion = '$Revision: 1.351 $ ';
package TinderUtils; package TinderUtils;
@ -1473,6 +1473,33 @@ sub PrintEnv {
print_log "$key=$ENV{$key}\n"; print_log "$key=$ENV{$key}\n";
} }
# If we're on auto-update, print out the version/branch of the configs
# we're using to do this build.
if (defined($Settings::TboxBuildConfigDir)) {
print_log "-->Tinderbox Config Info<--------------------------\n";
my $confDir = $Settings::TboxBuildConfigDir;
if (not(-d "$confDir/CVS")) {
print_log '--config-cvsup-dir is set, but refers to an invalid ' .
"(not-CVS) directory\n";
} else {
my $cwd = get_system_cwd();
if (chdir($confDir)) {
my $status = run_shell_command_with_timeout('cvs stat',
$co_default_timeout);
if ($status->{'exit_value'} != 0) {
print_log "cvs stat of configs in $confDir FAILED\n";
}
chdir($cwd) or die "Couldn't find my way back: $!\n";
} else {
print_log "chdir() to $confDir FAILED\n";
}
}
print_log "-->END Tinderbox Configuration Information<--------------\n";
}
# Print out mozconfig if found. # Print out mozconfig if found.
if (defined $ENV{MOZCONFIG} and -e $ENV{MOZCONFIG}) { if (defined $ENV{MOZCONFIG} and -e $ENV{MOZCONFIG}) {
print_log "-->mozconfig<----------------------------------------\n"; print_log "-->mozconfig<----------------------------------------\n";