X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2FNightlyTest.pl;h=9dcaa616578cb489c345d8314dff7fe7a74d23ed;hb=34695381d626485a560594f162701088079589df;hp=9bbbf49b14176b2176c1be1313b8456700dfee8b;hpb=004e19e38d810c3146c77b68a9274210ee008b1d;p=oota-llvm.git

diff --git a/utils/NightlyTest.pl b/utils/NightlyTest.pl
index 9bbbf49b141..9dcaa616578 100755
--- a/utils/NightlyTest.pl
+++ b/utils/NightlyTest.pl
@@ -198,9 +198,11 @@ sub GetDejagnuTestResults { # (filename, log)
   my @lines;
   my $firstline;
   $/ = "\n"; #Make sure we're going line at a time.
+
+  print "DEJAGNU TEST RESULTS:\n";
+
   if (open SRCHFILE, $filename) {
     # Process test results
-    push(@lines,"<h3>UNEXPECTED TEST RESULTS</h3><ol><li>\n");
     my $first_list = 1;
     my $should_break = 1;
     my $nocopy = 0;
@@ -211,20 +213,30 @@ sub GetDejagnuTestResults { # (filename, log)
         if ( m/^XPASS:/ || m/^FAIL:/ ) {
           $nocopy = 0;
           if ( $first_list ) {
+            push(@lines, "<h3>UNEXPECTED TEST RESULTS</h3><ol><li>\n");
             $first_list = 0;
             $should_break = 1;
-            push(@lines,"<b>$_</b><br/>\n");
+            push(@lines, "<b>$_</b><br/>\n");
+            print "  $_\n";
           } else {
-            push(@lines,"</li><li><b>$_</b><br/>\n");
+            push(@lines, "</li><li><b>$_</b><br/>\n");
+            print "  $_\n";
           }
         } elsif ( m/Summary/ ) {
-          if ( $first_list ) { push(@lines,"<b>PERFECT!</b>"); }
-          push(@lines,"</li></ol><h3>STATISTICS</h3><pre>\n");
+          if ( $first_list ) {
+            push(@lines, "<b>PERFECT!</b>"); 
+            print "  PERFECT!\n";
+          } else {
+            push(@lines, "</li></ol>\n");
+          }
+          push(@lines, "<h3>STATISTICS</h3><pre>\n");
+          print "\nDEJAGNU STATISTICS:\n";
           $should_break = 0;
           $nocopy = 0;
           $readingsum = 1;
         } elsif ( $readingsum ) {
           push(@lines,"$_\n");
+          print "  $_\n";
         }
       }
     }
@@ -232,7 +244,7 @@ sub GetDejagnuTestResults { # (filename, log)
   push(@lines, "</pre>\n");
   close SRCHFILE;
 
-  my $content = join("",@lines);
+  my $content = join("", @lines);
   return "$content</li></ol>\n";
 }
 
@@ -402,7 +414,7 @@ if (!$NOCHECKOUT) {
 my @Linked = split '\n', `grep Linking $BuildLog`;
 my $NumExecutables = scalar(grep(/executable/, @Linked));
 my $NumLibraries   = scalar(grep(!/executable/, @Linked));
-my $NumObjects     = `grep '^Compiling' $BuildLog | wc -l` + 0;
+my $NumObjects     = `grep ']\: Compiling ' $BuildLog | wc -l` + 0;
 
 my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$BuildLog";
 my $ConfigTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$BuildLog";
@@ -446,7 +458,6 @@ if(!$NODEJAGNU) {
   CopyFile("test/testrun.sum", $DejagnuSum);
 
   $DejagnuTestResults = GetDejagnuTestResults($DejagnuSum, $DejagnuLog);
-  print $DejagnuTestResults;
 
 } else {
   $DejagnuTestResults = "Skipped by user choice.";
@@ -535,8 +546,8 @@ foreach $File (@CVSHistory) {
   }
 }
 
-my $UserCommitList = join "\n", keys %UsersCommitted;
-my $UserUpdateList = join "\n", keys %UsersUpdated;
+my $UserCommitList = join "\n", sort keys %UsersCommitted;
+my $UserUpdateList = join "\n", sort keys %UsersUpdated;
 my $AddedFilesList = AddPreTag join "\n", sort keys %AddedFiles;
 my $ModifiedFilesList = AddPreTag join "\n", sort keys %ModifiedFiles;
 my $RemovedFilesList = AddPreTag join "\n", sort keys %RemovedFiles;
@@ -768,6 +779,18 @@ system ("$GNUPLOT", $PlotScriptFilename);
 #
 system ( "$NICE rm -rf $BuildDir") if (!$NOCHECKOUT and !$NOREMOVE);
 
+print "\nUSERS WHO COMMITTED:\n  " . (join "\n  ", sort keys %UsersCommitted) . "\n"
+  if (scalar %UsersCommitted);
+
+print "\nADDED FILES:\n  " . (join "\n  ", sort keys %AddedFiles) . "\n"
+  if (scalar %AddedFiles);
+
+print "\nCHANGED FILES:\n  " . (join "\n  ", sort keys %ModifiedFiles) . "\n"
+  if (scalar %ModifiedFiles);
+
+print "\nREMOVED FILES:\n  " . (join "\n  ", sort keys %RemovedFiles) . "\n"
+  if (scalar %RemovedFiles);
+
 #
 # Print out information...
 #
@@ -779,12 +802,6 @@ if ($VERBOSE) {
   print "Libraries/Executables/Objects built: $NumLibraries/$NumExecutables/$NumObjects\n";
 
   print "WARNINGS:\n  $WarningsList\n";
-
-  print "Users committed: $UserCommitList\n";
-  print "Added Files: \n  $AddedFilesList\n";
-  print "Modified Files: \n  $ModifiedFilesList\n";
-  print "Removed Files: \n  $RemovedFilesList\n";
-
   print "Previous Days =\n  $PrevDaysList\n";
 }