RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-19 02:52:53 +02:00
Code Issues Projects Releases Wiki Activity

NNT: Move build code into subroutine.

Browse Source 
llvm-svn: 84490
This commit is contained in:
Daniel Dunbar 2009-10-19 13:20:13 +00:00
parent 909b1e1428
commit 6c0be45d6a
1 changed files with 44 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
utils/NewNightlyTest.pl
View File

@ -584,6 +584,7 @@ ChangeDir( $LLVMSrcDir , "llvm source directory") ;
# Build the entire tree, saving build messages to the build log
#
##############################################################
sub BuildLLVM {
if (!$NOCHECKOUT && !$NOBUILD) {
my $EXTRAFLAGS = "--enable-spec --with-objroot=.";
RunLoggedCommand("(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) ",
@ -593,40 +594,25 @@ if (!$NOCHECKOUT && !$NOBUILD) {
RunAppendingLoggedCommand("(time -p $NICE $MAKECMD $MAKEOPTS)", $BuildLog, "BUILD");
}
##############################################################
#
# Get some statistics about the build...
#
##############################################################
# Get the time taken by the configure script
my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$BuildLog";
my $ConfigTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$BuildLog";
my $ConfigTime = $ConfigTimeU+$ConfigTimeS; # ConfigTime = User+System
my $ConfigWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$BuildLog";
$ConfigTime=-1 unless $ConfigTime;
$ConfigWallTime=-1 unless $ConfigWallTime;
my $BuildTimeU = GetRegexNum "^user", 1, "([0-9.]+)", "$BuildLog";
my $BuildTimeS = GetRegexNum "^sys", 1, "([0-9.]+)", "$BuildLog";
my $BuildTime = $BuildTimeU+$BuildTimeS; # BuildTime = User+System
my $BuildWallTime = GetRegexNum "^real", 1, "([0-9.]+)","$BuildLog";
$BuildTime=-1 unless $BuildTime;
$BuildWallTime=-1 unless $BuildWallTime;
my $BuildError = 0, $BuildStatus = "OK";
# Check for build error.
my $HadError = 0, $Status = "OK";
if ($NOBUILD) {
$BuildStatus = "Skipped by user";
$Status = "Skipped by user";
}
elsif (`grep '^$MAKECMD\[^:]*: .*Error' $BuildLog | wc -l` + 0 ||
`grep '^$MAKECMD: \*\*\*.*Stop.' $BuildLog | wc -l`+0) {
$BuildStatus = "Error: compilation aborted";
$BuildError = 1;
if( $VERBOSE) { print "\n***ERROR BUILDING TREE\n\n"; }
$Status = "Error: compilation aborted";
$HadError = 1;
}
return ($HadError, $Status);
}
($BuildError, $BuildStatus) = BuildLLVM();
if ($BuildError) {
if( $VERBOSE) { print "\n***ERROR BUILDING TREE\n\n"; }
$NODEJAGNU=1;
}
if ($BuildError) { $NODEJAGNU=1; }
##############################################################
#
@ -844,11 +830,29 @@ if(!$BuildError){
if ( $VERBOSE ) { print "SEND THE DATA VIA THE POST REQUEST\n"; }
# Checkout info.
my $CheckoutTime_Wall = GetRegex "([0-9.]+)", `grep '^real' $COLog`;
my $CheckoutTime_User = GetRegex "([0-9.]+)", `grep '^user' $COLog`;
my $CheckoutTime_Sys = GetRegex "([0-9.]+)", `grep '^sys' $COLog`;
my $CheckoutTime_CPU = $CVSCheckoutTime_User + $CVSCheckoutTime_Sys;
# Configure info.
my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$BuildLog";
my $ConfigTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$BuildLog";
my $ConfigTime = $ConfigTimeU+$ConfigTimeS; # ConfigTime = User+System
my $ConfigWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$BuildLog";
$ConfigTime=-1 unless $ConfigTime;
$ConfigWallTime=-1 unless $ConfigWallTime;
# Build info.
my $BuildTimeU = GetRegexNum "^user", 1, "([0-9.]+)", "$BuildLog";
my $BuildTimeS = GetRegexNum "^sys", 1, "([0-9.]+)", "$BuildLog";
my $BuildTime = $BuildTimeU+$BuildTimeS; # BuildTime = User+System
my $BuildWallTime = GetRegexNum "^real", 1, "([0-9.]+)","$BuildLog";
$BuildTime=-1 unless $BuildTime;
$BuildWallTime=-1 unless $BuildWallTime;
my %hash_of_data = (
'machine_data' => $machine_data,
'build_data' => $build_data,