Fix bugs found with recent addition of assertions in

[oota-llvm.git] / utils / NightlyTest.pl

diff --git a/utils/NightlyTest.pl b/utils/NightlyTest.pl
index 6b22295acf7d90884e64e0c7682d5c8642be7bcc..d02e660ad1923ec5714cb6439d6706605aaaf13d 100755 (executable)
--- a/utils/NightlyTest.pl
+++ b/utils/NightlyTest.pl
@@ -1,4 +1,4 @@
-#!/usr/dcs/software/supported/bin/perl -w
+#!/usr/bin/perl -w
 #
 # Program:  NightlyTest.pl
 #
@@ -18,6 +18,8 @@
 #  -norunningtests  Do not run the Olden benchmark suite with
 #                   LARGE_PROBLEM_SIZE enabled.
 #  -parallel        Run two parallel jobs with GNU Make.
+#  -enable-linscan  Enable linearscan tests
+#
 # CVSROOT is the CVS repository from which the tree will be checked out,
 #  specified either in the full :method:user@host:/dir syntax, or
 #  just /dir if using a local repo.
@@ -33,7 +35,7 @@ use POSIX qw(strftime);
 
 my $HOME = $ENV{'HOME'};
 my $CVSRootDir = $ENV{'CVSROOT'};
-my $CVSRootDir = "/home/vadve/shared/PublicCVS"
+   $CVSRootDir = "/home/vadve/shared/PublicCVS"
     unless $CVSRootDir;
 my $BuildDir   = "$HOME/buildtest";
 my $WebDir     = "$HOME/cvs/testresults-X86";
@@ -117,7 +119,7 @@ my $NOREMOVE   = 0;
 my $NOTEST     = 0;
 my $NORUNNINGTESTS = 0;
 my $MAKEOPTS   = "";
-
+my $ENABLELINEARSCAN = "";
 
 # Parse arguments...
 while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
@@ -130,6 +132,7 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
   if (/^-notest$/)         { $NOTEST     = 1; $NORUNNINGTESTS = 1; next; }
   if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
   if (/^-parallel$/)       { $MAKEOPTS   = "-j2 -l3.0"; next; }
+  if (/^-enable-linscan$/) { $ENABLELINEARSCAN = "ENABLE_LINEARSCAN=1"; next; }
 
   print "Unknown option: $_ : ignoring!\n";
 }
@@ -182,8 +185,8 @@ my $TemplateContents = ReadFile $Template;
 # Get some static statistics about the current state of CVS
 #
 my $CVSCheckoutTime = GetRegex "([0-9.]+)", `grep '^real' $Prefix-CVS-Log.txt`;
-my $NumFilesInCVS = `grep '^U' $Prefix-CVS-Log.txt | wc -l` + 0;
-my $NumDirsInCVS  = `grep '^cvs checkout' $Prefix-CVS-Log.txt | wc -l` + 0;
+my $NumFilesInCVS = `egrep '^U' $Prefix-CVS-Log.txt | wc -l` + 0;
+my $NumDirsInCVS  = `egrep '^cvs (checkout|server|update):' $Prefix-CVS-Log.txt | wc -l` + 0;
 $LOC = GetRegex "([0-9]+) +total", `wc -l \`utils/getsrcs.sh\` | grep total`;
 
 #
@@ -226,6 +229,7 @@ if (`grep '^gmake[^:]*: .*Error' $Prefix-Build-Log.txt | wc -l` + 0 ||
     `grep '^gmake: \*\*\*.*Stop.' $Prefix-Build-Log.txt | wc -l`+0) {
   $BuildError = "<h3><font color='red'>Build error: compilation " .
                 "<a href=\"$DATE-Build-Log.txt\">aborted</a></font></h3>";
+  print "BUILD ERROR\n";
 }
 
 #
@@ -252,10 +256,14 @@ $WarningsFile =~ s/:[0-9]+:/::/g;
 # Emit the warnings file, so we can diff...
 WriteFile "$WebDir/$DATE-Warnings.txt", $WarningsFile . "\n";
 my ($WarningsAdded, $WarningsRemoved) = DiffFiles "-Warnings.txt";
+
+# Output something to stdout if something has changed
+print "ADDED   WARNINGS:\n$WarningsAdded\n\n" if (length $WarningsAdded);
+print "REMOVED WARNINGS:\n$WarningsRemoved\n\n" if (length $WarningsRemoved);
+
 $WarningsAdded = AddPreTag $WarningsAdded;
 $WarningsRemoved = AddPreTag $WarningsRemoved;
 
-
 #
 # Get some statistics about CVS commits over the current day...
 #
@@ -273,8 +281,8 @@ foreach $File (@CVSHistory) {
   my ($Type, $Date, $UID, $Rev, $Filename);
   if ($File =~ /([AMRUGC]) ($DateRE) ([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)/) {
     ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, $4, "$6/$5");
-  } elsif ($File =~ /([W]) ($DateRE) ([^ ]+) +([^ ]+) +([^ ]+)/) {
-    ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, $4, "$6/$5");
+  } elsif ($File =~ /([W]) ($DateRE) ([^ ]+)/) {
+    ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, "", "");
   } elsif ($File =~ /([O]) ($DateRE) ([^ ]+) +([^ ]+)/) {
     ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, "", "$4/");
   } else {
@@ -318,8 +326,8 @@ sub TestDirectory {
 
   # Run the programs tests... creating a report.nightly.html file
   if (!$NOTEST) {
-    system "gmake $MAKEOPTS report.nightly.html TEST=nightly "
-         . "> $Prefix-$SubDir-ProgramTest.txt 2>&1";
+    system "gmake -k $MAKEOPTS $ENABLELINEARSCAN report.nightly.html "
+         . "TEST=nightly > $Prefix-$SubDir-ProgramTest.txt 2>&1";
   } else {
     system "gunzip $Prefix-$SubDir-ProgramTest.txt.gz";
   }
@@ -328,10 +336,12 @@ sub TestDirectory {
   if (`grep '^gmake[^:]: .*Error' $Prefix-$SubDir-ProgramTest.txt | wc -l` + 0){
     $TestError = 1;
     $ProgramsTable = "<font color=white><h2>Error running tests!</h2></font>";
+    print "ERROR TESTING\n";
   } elsif (`grep '^gmake[^:]: .*No rule to make target' $Prefix-$SubDir-ProgramTest.txt | wc -l` + 0) {
     $TestError = 1;
     $ProgramsTable =
       "<font color=white><h2>Makefile error running tests!</h2></font>";
+    print "ERROR TESTING\n";
   } else {
     $TestError = 0;
     $ProgramsTable = ReadFile "report.nightly.html";
@@ -391,12 +401,18 @@ if ($TestError) {
     $TestsRemoved = "$TestsRemoved$Test\n" if (!exists $NewTests{$Test});
   }
 
+  print "\nTESTS ADDED:  \n\n$TestsAdded\n\n"   if (length $TestsAdded);
+  print "\nTESTS REMOVED:\n\n$TestsRemoved\n\n" if (length $TestsRemoved);
+  print "\nTESTS FIXED:  \n\n$TestsFixed\n\n"   if (length $TestsFixed);
+  print "\nTESTS BROKEN: \n\n$TestsBroken\n\n"  if (length $TestsBroken);
+
   $TestsAdded   = AddPreTag $TestsAdded;
   $TestsRemoved = AddPreTag $TestsRemoved;
   $TestsFixed   = AddPreTag $TestsFixed;
   $TestsBroken  = AddPreTag $TestsBroken;
 }
 
+
 # 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 "") {
@@ -409,7 +425,7 @@ if ($BuildError eq "") {
     system "gmake $MAKEOPTS clean > /dev/null 2>&1";
 
     # Run the nightly test in this directory, with LARGE_PROBLEM_SIZE enabled!
-    system "gmake $MAKEOPTS report.nightly.raw.out TEST=nightly " .
+    system "gmake -k $MAKEOPTS report.nightly.raw.out TEST=nightly " .
            " LARGE_PROBLEM_SIZE=1 > /dev/null 2>&1";
     system "cp report.nightly.raw.out $Prefix-Olden-tests.txt";
   } else {