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 d41deda39585709646789382e22c6aeaea45e15b..09f310d5f33f433ae82ba1962e6597448fda948f 100755 (executable)
--- 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 = "<h3><font color='red'>error: compilation " .
+  $BuildStatus = "<h3><font color='red'>error: compilation " .
                 "<a href=\"$DATE-Build-Log.txt\">aborted</a></font></h3>";
+  $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 43cf83bca9f80ae26d9e33ba352baf7b999a5236..43ce1372b3614191ebf0e0ad096cbb05c204adc7 100644 (file)
--- a/utils/NightlyTestTemplate.html
+++ b/utils/NightlyTestTemplate.html
@@ -73,7 +73,7 @@
 <li>Number of object files compiled: <b>$NumObjects</b></li>
 <li>Number of libraries linked: <b>$NumLibraries</b></li>
 <li>Number of executables linked:<b> $NumExecutables</b></li>
-<li>Build Status: $BuildError</li>
+<li>Build Status: $BuildStatus</li>
 </ul>
 
 <h2>Warnings during the build:</h2>