From: Misha Brukman Date: Wed, 12 Jan 2005 03:31:38 +0000 (+0000) Subject: Use and print out BuildStatus, we don't always have build errors. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9a6127504a8a9cb5483d157a1d3a1da8ce358a8b;p=oota-llvm.git Use and print out BuildStatus, we don't always have build errors. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19497 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/utils/NightlyTest.pl b/utils/NightlyTest.pl index d41deda3958..09f310d5f33 100755 --- a/utils/NightlyTest.pl +++ b/utils/NightlyTest.pl @@ -414,11 +414,12 @@ my $BuildTimeS = GetRegexNum "^sys", 1, "([0-9.]+)", "$BuildLog"; my $BuildTime = $BuildTimeU+$BuildTimeS; # BuildTime = User+System my $BuildWallTime = GetRegexNum "^real", 1, "([0-9.]+)","$BuildLog"; -my $BuildError = ""; +my $BuildError = 0, $BuildStatus = "OK"; if (`grep '^gmake[^:]*: .*Error' $BuildLog | wc -l` + 0 || `grep '^gmake: \*\*\*.*Stop.' $BuildLog | wc -l`+0) { - $BuildError = "

error: compilation " . + $BuildStatus = "

error: compilation " . "aborted

"; + $BuildError = 1; if ($VERBOSE) { print "BUILD ERROR\n"; } } @@ -589,7 +590,7 @@ sub TestDirectory { } # If we built the tree successfully, run the nightly programs tests... -if ($BuildError eq "") { +if (!$BuildError) { if ( $VERBOSE ) { print "SingleSource TEST STAGE\n"; } @@ -663,7 +664,7 @@ if ($TestError) { # If we built the tree successfully, runs of the Olden suite with # LARGE_PROBLEM_SIZE on so that we can get some "running" statistics. -if ($BuildError eq "") { +if (!$BuildError) { if ( $VERBOSE ) { print "OLDEN TEST SUITE STAGE\n"; } my ($NATTime, $CBETime, $LLCTime, $JITTime, $OptTime, $BytecodeSize, $MachCodeSize) = ("","","","","","",""); diff --git a/utils/NightlyTestTemplate.html b/utils/NightlyTestTemplate.html index 43cf83bca9f..43ce1372b36 100644 --- a/utils/NightlyTestTemplate.html +++ b/utils/NightlyTestTemplate.html @@ -73,7 +73,7 @@
  • Number of object files compiled: $NumObjects
  • Number of libraries linked: $NumLibraries
  • Number of executables linked: $NumExecutables
  • -
  • Build Status: $BuildError
  • +
  • Build Status: $BuildStatus
  • Warnings during the build: