X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2FNewNightlyTest.pl;h=feae7abed496a2bf3b4c5f35eff688509e4be567;hb=b9c65eb6008237abf96581e4d94f0e4ae187f025;hp=e917abf1ac19c9915a3f2acdbf226fa3715d41df;hpb=dcffb0cf818ede16c87f4230f336324b6be51712;p=oota-llvm.git

diff --git a/utils/NewNightlyTest.pl b/utils/NewNightlyTest.pl
index e917abf1ac1..feae7abed49 100755
--- a/utils/NewNightlyTest.pl
+++ b/utils/NewNightlyTest.pl
@@ -9,7 +9,7 @@ use Socket;
 # Synopsis: Perform a series of tests which are designed to be run nightly.
 #           This is used to keep track of the status of the LLVM tree, tracking
 #           regressions and performance changes. Submits this information 
-#           to llvm.org where it is placed into the nightlytestresults database. 
+#           to llvm.org where it is placed into the nightlytestresults database.
 #
 # Modified heavily by Patrick Jenkins, July 2006
 #
@@ -52,7 +52,7 @@ use Socket;
 #                   the default.
 #  -compileflags    Next argument specifies extra options passed to make when
 #                   building LLVM.
-#  -use-gmake    		Use gmake instead of the default make command to build
+#  -use-gmake       Use gmake instead of the default make command to build
 #                   llvm and run tests.
 #
 #  ---------------- Options to configure llvm-test ----------------------------
@@ -61,6 +61,14 @@ use Socket;
 #  -noexternals     Do not run the external tests (for cases where povray
 #                   or SPEC are not installed)
 #  -with-externals  Specify a directory where the external tests are located.
+#  -submit-server   Specifies a server to submit the test results too. If this
+#                   option is not specified it defaults to 
+#                   llvm.org. This is basically just the address of the 
+#                   webserver
+#  -submit-script   Specifies which script to call on the submit server. If
+#                   this option is not specified it defaults to
+#                   /nightlytest/NightlyTestAccept.cgi. This is basically 
+#                   everything after the www.yourserver.org.
 #
 # CVSROOT is the CVS repository from which the tree will be checked out,
 #  specified either in the full :method:user@host:/dir syntax, or
@@ -80,16 +88,13 @@ use Socket;
 # Getting environment variables
 #
 ##############################################################
-my $HOME = $ENV{'HOME'};
+my $HOME       = $ENV{'HOME'};
 my $CVSRootDir = $ENV{'CVSROOT'};
-   $CVSRootDir = "/home/vadve/shared/PublicCVS"
-    unless $CVSRootDir;
+$CVSRootDir    = "/home/vadve/shared/PublicCVS" unless $CVSRootDir;
 my $BuildDir   = $ENV{'BUILDDIR'};
-   $BuildDir   = "$HOME/buildtest"
-    unless $BuildDir;
+$BuildDir      = "$HOME/buildtest" unless $BuildDir;
 my $WebDir     = $ENV{'WEBDIR'};
-   $WebDir     = "$HOME/cvs/testresults-X86"
-    unless $WebDir;
+$WebDir        = "$HOME/cvs/testresults-X86" unless $WebDir;
 
 ##############################################################
 #
@@ -111,110 +116,98 @@ $nickname="";
 $NOTEST=0;
 $NORUNNINGTESTS=0;
 $MAKECMD="make";
+$SUBMITSERVER = "llvm.org";
+$SUBMITSCRIPT = "/nightlytest/NightlyTestAccept.cgi";
 
 while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
-    shift;
-    last if /^--$/;  # Stop processing arguments on --
+  shift;
+  last if /^--$/;  # Stop processing arguments on --
 
   # List command line options here...
-    if (/^-nocheckout$/)     { $NOCHECKOUT = 1; next; }
-    if (/^-nocvsstats$/)     { $NOCVSSTATS = 1; next; }
-    if (/^-noremove$/)       { $NOREMOVE = 1; next; }
-    if (/^-noremoveresults$/) { $NOREMOVERESULTS = 1; next; }
-    if (/^-notest$/)         { $NOTEST = 1; $NORUNNINGTESTS = 1; next; }
-    if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
-    if (/^-parallel$/)       { $MAKEOPTS = "$MAKEOPTS -j2 -l3.0"; next; }
-    if (/^-release$/)        { $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1 ".
-    						   						             "OPTIMIZE_OPTION=-O2"; 
-    						               $BUILDTYPE="release"; next; }
-    if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= " ENABLE_LLCBETA=1"; next; }
-    if (/^-disable-llc$/)    { $PROGTESTOPTS .= " DISABLE_LLC=1";
-			       $CONFIGUREARGS .= " --disable-llc_diffs"; next; } 
-    if (/^-disable-jit$/)    { $PROGTESTOPTS .= " DISABLE_JIT=1";
-			       $CONFIGUREARGS .= " --disable-jit"; next; }
-    if (/^-disable-cbe$/)    { $PROGTESTOPTS .= " DISABLE_CBE=1"; next; }
-    if (/^-verbose$/)        { $VERBOSE = 1; next; }
-    if (/^-debug$/)          { $DEBUG = 1; next; }
-    if (/^-nice$/)           { $NICE = "nice "; next; }
-    if (/^-f2c$/)            {
-	$CONFIGUREARGS .= " --with-f2c=$ARGV[0]"; shift; next;
-    }
-    if (/^-with-externals$/)  {
-	$CONFIGUREARGS .= " --with-externals=$ARGV[0]"; shift; next;
-    }
-    if (/^-nickname$/)   	{ $nickname = "$ARGV[0]"; shift; next; }
-    if (/^-gccpath/)         { $CONFIGUREARGS .= 
-    													   " CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++"; 
-                               $GCCPATH=$ARGV[0]; 
-                               shift;  
-                               next;}
-    else{ $GCCPATH=""; }
-    if (/^-cvstag/)          { $CVSCOOPT .= " -r $ARGV[0]"; shift; next; } 
-    else{ $CVSCOOPT="";}
-    if (/^-target/)          {
-	$CONFIGUREARGS .= " --target=$ARGV[0]"; shift; next;
-    }
-    if (/^-cflags/)          {
-	$MAKEOPTS = "$MAKEOPTS C.Flags=\'$ARGV[0]\'"; shift; next;
-    }
-    if (/^-cxxflags/)        {
-	$MAKEOPTS = "$MAKEOPTS CXX.Flags=\'$ARGV[0]\'"; shift; next;
-    }
-    if (/^-ldflags/)         {
-	$MAKEOPTS = "$MAKEOPTS LD.Flags=\'$ARGV[0]\'"; shift; next;
-    }
-    if (/^-compileflags/)    {
-	$MAKEOPTS = "$MAKEOPTS $ARGV[0]"; shift; next;
-    }
-    if (/^-use-gmake/)    {
-			$MAKECMD = "gmake"; shift; next;
-    }
-    if (/^-compileflags/)    {
-        $MAKEOPTS = "$MAKEOPTS $ARGV[0]"; shift; next;
-    }
-    if (/^-extraflags/)      {
-        $CONFIGUREARGS .= " --with-extra-options=\'$ARGV[0]\'"; shift; next;
-    }
-    if (/^-noexternals$/)    { $NOEXTERNALS = 1; next; }
-    if (/^-nodejagnu$/)      { $NODEJAGNU = 1; next; }
-    if (/^-nobuild$/)        { $NOBUILD = 1; next; }
-    print "Unknown option: $_ : ignoring!\n";
+  if (/^-nocheckout$/)     { $NOCHECKOUT = 1; next; }
+  if (/^-nocvsstats$/)     { $NOCVSSTATS = 1; next; }
+  if (/^-noremove$/)       { $NOREMOVE = 1; next; }
+  if (/^-noremoveresults$/){ $NOREMOVERESULTS = 1; next; }
+  if (/^-notest$/)         { $NOTEST = 1; $NORUNNINGTESTS = 1; next; }
+  if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
+  if (/^-parallel$/)       { $MAKEOPTS = "$MAKEOPTS -j2 -l3.0"; next; }
+  if (/^-release$/)        { $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1 ".
+                             "OPTIMIZE_OPTION=-O2"; $BUILDTYPE="release"; next;}
+  if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= " ENABLE_LLCBETA=1"; next; }
+  if (/^-disable-llc$/)    { $PROGTESTOPTS .= " DISABLE_LLC=1";
+                             $CONFIGUREARGS .= " --disable-llc_diffs"; next; } 
+  if (/^-disable-jit$/)    { $PROGTESTOPTS .= " DISABLE_JIT=1";
+                             $CONFIGUREARGS .= " --disable-jit"; next; }
+  if (/^-disable-cbe$/)    { $PROGTESTOPTS .= " DISABLE_CBE=1"; next; }
+  if (/^-verbose$/)        { $VERBOSE = 1; next; }
+  if (/^-debug$/)          { $DEBUG = 1; next; }
+  if (/^-nice$/)           { $NICE = "nice "; next; }
+  if (/^-f2c$/)            { $CONFIGUREARGS .= " --with-f2c=$ARGV[0]"; 
+                             shift; next; }
+  if (/^-with-externals$/) { $CONFIGUREARGS .= " --with-externals=$ARGV[0]"; 
+                             shift; next; }
+  if (/^-submit-server/)   { $SUBMITSERVER = "$ARGV[0]"; shift; next; }
+  if (/^-submit-script/)   { $SUBMITSCRIPT = "$ARGV[0]"; shift; next; }
+  if (/^-nickname$/)       { $nickname = "$ARGV[0]"; shift; next; } 
+  if (/^-gccpath/)         { $CONFIGUREARGS .= 
+                             " CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++"; 
+                             $GCCPATH=$ARGV[0]; shift;  next; }
+  else                     { $GCCPATH=""; }
+  if (/^-cvstag/)          { $CVSCOOPT .= " -r $ARGV[0]"; shift; next; } 
+  else                     { $CVSCOOPT="";}
+  if (/^-target/)          { $CONFIGUREARGS .= " --target=$ARGV[0]"; 
+                             shift; next; }
+  if (/^-cflags/)          { $MAKEOPTS = "$MAKEOPTS C.Flags=\'$ARGV[0]\'"; 
+                             shift; next; }
+  if (/^-cxxflags/)        { $MAKEOPTS = "$MAKEOPTS CXX.Flags=\'$ARGV[0]\'"; 
+                             shift; next; }
+  if (/^-ldflags/)         { $MAKEOPTS = "$MAKEOPTS LD.Flags=\'$ARGV[0]\'"; 
+                             shift; next; }
+  if (/^-compileflags/)    { $MAKEOPTS = "$MAKEOPTS $ARGV[0]"; shift; next; }
+  if (/^-use-gmake/)       { $MAKECMD = "gmake"; shift; next; }
+  if (/^-compileflags/)    { $MAKEOPTS = "$MAKEOPTS $ARGV[0]"; shift; next; }
+  if (/^-extraflags/)      { $CONFIGUREARGS .= 
+                             " --with-extra-options=\'$ARGV[0]\'"; shift; next;}
+  if (/^-noexternals$/)    { $NOEXTERNALS = 1; next; }
+  if (/^-nodejagnu$/)      { $NODEJAGNU = 1; next; }
+  if (/^-nobuild$/)        { $NOBUILD = 1; next; }
+  print "Unknown option: $_ : ignoring!\n";
 }
 
 if ($ENV{'LLVMGCCDIR'}) {
-    $CONFIGUREARGS .= " --with-llvmgccdir=" . $ENV{'LLVMGCCDIR'};
+  $CONFIGUREARGS .= " --with-llvmgccdir=" . $ENV{'LLVMGCCDIR'};
 }
 if ($CONFIGUREARGS !~ /--disable-jit/) {
-    $CONFIGUREARGS .= " --enable-jit";
+  $CONFIGUREARGS .= " --enable-jit";
 }
 
-
-if (@ARGV != 0 and @ARGV != 3 and $VERBOSE){
-	foreach $x (@ARGV){
-		print "$x\n";
-	}
-	print "Must specify 0 or 3 options!";
+if (@ARGV != 0 and @ARGV != 3 and $VERBOSE) {
+  foreach $x (@ARGV) {
+    print "$x\n";
+  }
+  print "Must specify 0 or 3 options!";
 }
 
 if (@ARGV == 3) {
-    $CVSRootDir = $ARGV[0];
-    $BuildDir   = $ARGV[1];
-    $WebDir     = $ARGV[2];
+  $CVSRootDir = $ARGV[0];
+  $BuildDir   = $ARGV[1];
+  $WebDir     = $ARGV[2];
 }
 
-if($CVSRootDir eq "" or
-   $BuildDir   eq "" or
-   $WebDir     eq ""){
-   die("please specify a cvs root directory, a build directory, and a ".
+if ($CVSRootDir eq "" or
+    $BuildDir   eq "" or
+    $WebDir     eq "") {
+  die("please specify a cvs root directory, a build directory, and a ".
        "web directory");
  }
  
-if($nickname eq ""){
-	die ("Please invoke NewNightlyTest.pl with command line option \"-nickname <nickname>\"");
+if ($nickname eq "") {
+  die ("Please invoke NewNightlyTest.pl with command line option " . 
+       "\"-nickname <nickname>\"");
 }
 
-if($BUILDTYPE ne "release"){
-	$BUILDTYPE = "debug";
+if ($BUILDTYPE ne "release") {
+  $BUILDTYPE = "debug";
 }
 
 ##############################################################
@@ -233,18 +226,18 @@ my $DejagnuLog = "$Prefix-Dejagnu-testrun.log";
 my $DejagnuSum = "$Prefix-Dejagnu-testrun.sum";
 my $DejagnuTestsLog = "$Prefix-DejagnuTests-Log.txt";
 if (! -d $WebDir) {
-    mkdir $WebDir, 0777;
-    warn "$WebDir did not exist; creating it.\n";
+  mkdir $WebDir, 0777;
+  warn "$WebDir did not exist; creating it.\n";
 }
 
 if ($VERBOSE) {
-    print "INITIALIZED\n";
-    print "CVS Root = $CVSRootDir\n";
-    print "BuildDir = $BuildDir\n";
-    print "WebDir   = $WebDir\n";
-    print "Prefix   = $Prefix\n";
-    print "CVSLog   = $CVSLog\n";
-    print "BuildLog = $BuildLog\n";
+  print "INITIALIZED\n";
+  print "CVS Root = $CVSRootDir\n";
+  print "BuildDir = $BuildDir\n";
+  print "WebDir   = $WebDir\n";
+  print "Prefix   = $Prefix\n";
+  print "CVSLog   = $CVSLog\n";
+  print "BuildLog = $BuildLog\n";
 }
 
 ##############################################################
@@ -253,11 +246,11 @@ if ($VERBOSE) {
 #
 ##############################################################
 sub GetDir {
-    my $Suffix = shift;
-    opendir DH, $WebDir;
-    my @Result = reverse sort grep !/$DATE/, grep /[-0-9]+$Suffix/, readdir DH;
-    closedir DH;
-    return @Result;
+  my $Suffix = shift;
+  opendir DH, $WebDir;
+  my @Result = reverse sort grep !/$DATE/, grep /[-0-9]+$Suffix/, readdir DH;
+  closedir DH;
+  return @Result;
 }
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -268,95 +261,94 @@ sub GetDir {
 #
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 sub DiffFiles {
-    my $Suffix = shift;
-    my @Others = GetDir $Suffix;
-    if (@Others == 0) {  # No other files?  We added all entries...
-	return (`cat $WebDir/$DATE$Suffix`, "");
-    }
-  # Diff the files now...
-    my @Diffs = split "\n", `diff $WebDir/$DATE$Suffix $WebDir/$Others[0]`;
-    my $Added   = join "\n", grep /^</, @Diffs;
-    my $Removed = join "\n", grep /^>/, @Diffs;
-    $Added =~ s/^< //gm;
-    $Removed =~ s/^> //gm;
-    return ($Added, $Removed);
+  my $Suffix = shift;
+  my @Others = GetDir $Suffix;
+  if (@Others == 0) {  # No other files?  We added all entries...
+    return (`cat $WebDir/$DATE$Suffix`, "");
+  }
+# Diff the files now...
+  my @Diffs = split "\n", `diff $WebDir/$DATE$Suffix $WebDir/$Others[0]`;
+  my $Added   = join "\n", grep /^</, @Diffs;
+  my $Removed = join "\n", grep /^>/, @Diffs;
+  $Added =~ s/^< //gm;
+  $Removed =~ s/^> //gm;
+  return ($Added, $Removed);
 }
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 sub GetRegex {   # (Regex with ()'s, value)
-    $_[1] =~ /$_[0]/m;
-    if (defined($1)) {
-	return $1;
-    }
-    return "0";
+  $_[1] =~ /$_[0]/m;
+  return $1 
+    if (defined($1));
+  return "0";
 }
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 sub GetRegexNum {
-    my ($Regex, $Num, $Regex2, $File) = @_;
-    my @Items = split "\n", `grep '$Regex' $File`;
-    return GetRegex $Regex2, $Items[$Num];
+  my ($Regex, $Num, $Regex2, $File) = @_;
+  my @Items = split "\n", `grep '$Regex' $File`;
+  return GetRegex $Regex2, $Items[$Num];
 }
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 sub ChangeDir { # directory, logical name
-    my ($dir,$name) = @_;
-    chomp($dir);
-    if ( $VERBOSE ) { print "Changing To: $name ($dir)\n"; }
-    $result = chdir($dir);
-    if(!$result){
-    	print "ERROR!!! Cannot change directory to: $name ($dir) because $!"; 
-    	return false;
-    }
-    return true;
+  my ($dir,$name) = @_;
+  chomp($dir);
+  if ( $VERBOSE ) { print "Changing To: $name ($dir)\n"; }
+  $result = chdir($dir);
+  if (!$result) {
+    print "ERROR!!! Cannot change directory to: $name ($dir) because $!"; 
+    return false;
+  }
+  return true;
 }
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 sub ReadFile {
-    if (open (FILE, $_[0])) {
-	undef $/;
-	my $Ret = <FILE>;
-	close FILE;
-	$/ = '\n';
-	return $Ret;
-    } else {
-	print "Could not open file '$_[0]' for reading!\n";
-	return "";
-    }
+  if (open (FILE, $_[0])) {
+    undef $/;
+    my $Ret = <FILE>;
+    close FILE;
+    $/ = '\n';
+    return $Ret;
+  } else {
+    print "Could not open file '$_[0]' for reading!\n";
+    return "";
+  }
 }
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 sub WriteFile {  # (filename, contents)
-    open (FILE, ">$_[0]") or die "Could not open file '$_[0]' for writing!\n";
-    print FILE $_[1];
-    close FILE;
+  open (FILE, ">$_[0]") or die "Could not open file '$_[0]' for writing!\n";
+  print FILE $_[1];
+  close FILE;
 }
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 sub CopyFile { #filename, newfile
-    my ($file, $newfile) = @_;
-    chomp($file);
-    if ($VERBOSE) { print "Copying $file to $newfile\n"; }
-    copy($file, $newfile);
+  my ($file, $newfile) = @_;
+  chomp($file);
+  if ($VERBOSE) { print "Copying $file to $newfile\n"; }
+  copy($file, $newfile);
 }
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 sub AddRecord {
-    my ($Val, $Filename,$WebDir) = @_;
-    my @Records;
-    if (open FILE, "$WebDir/$Filename") {
-	@Records = grep !/$DATE/, split "\n", <FILE>;
-	close FILE;
-    }
-    push @Records, "$DATE: $Val";
-    WriteFile "$WebDir/$Filename", (join "\n", @Records) . "\n";
+  my ($Val, $Filename,$WebDir) = @_;
+  my @Records;
+  if (open FILE, "$WebDir/$Filename") {
+    @Records = grep !/$DATE/, split "\n", <FILE>;
+    close FILE;
+  }
+  push @Records, "$DATE: $Val";
+  WriteFile "$WebDir/$Filename", (join "\n", @Records) . "\n";
 }
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -365,72 +357,47 @@ sub AddRecord {
 #
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 sub FormatTime {
-    my $Time = shift;
-    if ($Time =~ m/([0-9]+)m([0-9.]+)/) {
-	$Time = sprintf("%7.4f", $1*60.0+$2);
-    }
-    return $Time;
+  my $Time = shift;
+  if ($Time =~ m/([0-9]+)m([0-9.]+)/) {
+    $Time = sprintf("%7.4f", $1*60.0+$2);
+  }
+  return $Time;
 }
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+# This function is meant to read in the dejagnu sum file and 
+# return a string with only the results (i.e. PASS/FAIL/XPASS/
+# XFAIL).
+#
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 sub GetDejagnuTestResults { # (filename, log)
     my ($filename, $DejagnuLog) = @_;
     my @lines;
-    my $firstline;
     $/ = "\n"; #Make sure we're going line at a time.
 
     if( $VERBOSE) { print "DEJAGNU TEST RESULTS:\n"; }
 
     if (open SRCHFILE, $filename) {
-    # Process test results
-	my $first_list = 1;
-	my $should_break = 1;
-	my $nocopy = 0;
-	my $readingsum = 0;
-	while ( <SRCHFILE> ) {
-	    if ( length($_) > 1 ) {
-		chomp($_);
-		if ( m/^XPASS:/ || m/^FAIL:/ ) {
-		    $nocopy = 0;
-		    if ( $first_list ) {
-			push(@lines, "UNEXPECTED TEST RESULTS\n");
-			$first_list = 0;
-			$should_break = 1;
-			push(@lines, "$_\n");
-			if( $VERBOSE) { print "  $_\n"; }
-		    } else {
-			push(@lines, "$_\n");
-			if( $VERBOSE) { print "  $_\n"; }
-		    }
-		} #elsif ( m/Summary/ ) {
-		#    if ( $first_list ) {
-		#	push(@lines, "PERFECT!");
-		#	print "  PERFECT!\n";
-		#    } else {
-		#	push(@lines, "</li></ol>\n");
-		#    }
-		#    push(@lines, "STATISTICS\n");
-		#    print "\nDEJAGNU STATISTICS:\n";
-		#    $should_break = 0;
-		#    $nocopy = 0;
-		#    $readingsum = 1;
-		#} 
-		elsif ( $readingsum ) {
-		    push(@lines,"$_\n");
-		    if( $VERBOSE) { print "  $_\n"; }
-		}
-
-	    }
-	}
+        # Process test results
+        while ( <SRCHFILE> ) {
+            if ( length($_) > 1 ) {
+                chomp($_);
+                if ( m/^PASS:/ || m/^XPASS:/ ||
+                     m/^FAIL:/ || m/^XFAIL:/) {
+                    push(@lines, "$_");
+                }
+            }
+        }
     }
     close SRCHFILE;
 
-    my $content = join("", @lines);
+    my $content = join("\n", @lines);
     return $content;
 }
 
 
+
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 # This function acts as a mini web browswer submitting data
@@ -445,7 +412,7 @@ sub SendData{
     $port=80;
     $socketaddr= sockaddr_in $port, inet_aton $host or die "Bad hostname\n";
     socket SOCK, PF_INET, SOCK_STREAM, getprotobyname('tcp') or 
-    			 die "Bad socket\n";
+      die "Bad socket\n";
     connect SOCK, $socketaddr or die "Bad connection\n";
     select((select(SOCK), $| = 1)[0]);
 
@@ -495,17 +462,17 @@ $starttime = `date "+20%y-%m-%d %H:%M:%S"`;
 #
 ##############################################################
 if (!$NOCHECKOUT) {
-    if (-d $BuildDir) {
-	if (!$NOREMOVE) {
-		if ( $VERBOSE ){
-			print "Build directory exists! Removing it\n";
-		}
-	    system "rm -rf $BuildDir";
-	} else {
-	    die "CVS checkout directory $BuildDir already exists!";
-	}
+  if (-d $BuildDir) {
+    if (!$NOREMOVE) {
+      if ( $VERBOSE ) {
+        print "Build directory exists! Removing it\n";
+      }
+      system "rm -rf $BuildDir";
+    } else {
+       die "CVS checkout directory $BuildDir already exists!";
     }
-    mkdir $BuildDir or die "Could not create CVS checkout directory $BuildDir!";
+  }
+  mkdir $BuildDir or die "Could not create CVS checkout directory $BuildDir!";
 }
 ChangeDir( $BuildDir, "CVS checkout directory" );
 
@@ -517,22 +484,23 @@ ChangeDir( $BuildDir, "CVS checkout directory" );
 ##############################################################
 my $CVSOPT = "";
 # Use compression if going over ssh.
-$CVSOPT = "-z3" if $CVSRootDir =~ /^:ext:/;
+$CVSOPT = "-z3" 
+  if $CVSRootDir =~ /^:ext:/;
 my $CVSCMD = "$NICE cvs $CVSOPT -d $CVSRootDir co $CVSCOOPT";
 if (!$NOCHECKOUT) {
-    if ( $VERBOSE ) 
-    { 
-	print "CHECKOUT STAGE:\n"; 
-	print "( time -p $CVSCMD llvm; cd llvm/projects ; $CVSCMD llvm-test ) > $CVSLog 2>&1\n";
-    }
-    system "( time -p $CVSCMD llvm; cd llvm/projects ; " .
-	"$CVSCMD llvm-test ) > $CVSLog 2>&1";
-    ChangeDir( $BuildDir , "CVS Checkout directory") ;
+  if ( $VERBOSE ) { 
+    print "CHECKOUT STAGE:\n"; 
+    print "( time -p $CVSCMD llvm; cd llvm/projects ; $CVSCMD llvm-test ) " .
+          "> $CVSLog 2>&1\n";
+  }
+  system "( time -p $CVSCMD llvm; cd llvm/projects ; " .
+      "$CVSCMD llvm-test ) > $CVSLog 2>&1";
+  ChangeDir( $BuildDir , "CVS Checkout directory") ;
 }
 ChangeDir( "llvm" , "llvm source directory") ;
 if (!$NOCHECKOUT) {
-    if ( $VERBOSE ) { print "UPDATE STAGE\n"; }
-    system "$NICE cvs update -PdRA >> $CVSLog 2>&1" ;
+  if ( $VERBOSE ) { print "UPDATE STAGE\n"; }
+  system "$NICE cvs update -PdRA >> $CVSLog 2>&1" ;
 }
 
 ##############################################################
@@ -548,14 +516,14 @@ my $CVSCheckoutTime_Sys = GetRegex "([0-9.]+)", `grep '^sys' $CVSLog`;
 my $CVSCheckoutTime_CPU = $CVSCheckoutTime_User + $CVSCheckoutTime_Sys;
 
 my $NumFilesInCVS = `egrep '^U' $CVSLog | wc -l` + 0;
-my $NumDirsInCVS  = `egrep '^cvs (checkout|server|update):' $CVSLog | wc -l` + 0;
-my $LOC = `utils/countloc.sh`;
+my $NumDirsInCVS  = 
+   `egrep '^cvs (checkout|server|update):' $CVSLog | wc -l` + 0;
 
 ##############################################################
 #
 # Extract some information from the CVS history... use a hash so no duplicate
 # stuff is stored. This gets the history from the previous days worth
-# of cvs activit and parses it.
+# of cvs activity and parses it.
 #
 ##############################################################
 
@@ -563,44 +531,44 @@ my (%AddedFiles, %ModifiedFiles, %RemovedFiles, %UsersCommitted, %UsersUpdated);
 
 if(!$NOCVSSTATS){
 
-if ($VERBOSE) { print "CVS HISTORY ANALYSIS STAGE\n"; }
-@CVSHistory = split "\n", `cvs history -D '1 day ago' -a -xAMROCGUW`;
+  if ($VERBOSE) { print "CVS HISTORY ANALYSIS STAGE\n"; }
+  @CVSHistory = split "\n", `cvs history -D '1 day ago' -a -xAMROCGUW`;
 #print join "\n", @CVSHistory; print "\n";
 
-my $DateRE = '[-/:0-9 ]+\+[0-9]+';
+  my $DateRE = '[-/:0-9 ]+\+[0-9]+';
 
 # Loop over every record from the CVS history, filling in the hashes.
-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, "", "");
-    } elsif ($File =~ /([O]) ($DateRE) ([^ ]+) +([^ ]+)/) {
-	($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, "", "$4/");
-    } else {
-	print "UNMATCHABLE: $File\n";
-	next;
-    }
-    # print "$File\nTy = $Type Date = '$Date' UID=$UID Rev=$Rev File = '$Filename'\n";
-    
-    if ($Filename =~ /^llvm/) {
-	if ($Type eq 'M') {        # Modified
-	    $ModifiedFiles{$Filename} = 1;
-	    $UsersCommitted{$UID} = 1;
-	} elsif ($Type eq 'A') {   # Added
-	    $AddedFiles{$Filename} = 1;
-	    $UsersCommitted{$UID} = 1;
-	} elsif ($Type eq 'R') {   # Removed
-	    $RemovedFiles{$Filename} = 1;
-	    $UsersCommitted{$UID} = 1;
-	} else {
-	    $UsersUpdated{$UID} = 1;
-	}
-    }
-}
+  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, "", "");
+      } elsif ($File =~ /([O]) ($DateRE) ([^ ]+) +([^ ]+)/) {
+          ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, "", "$4/");
+      } else {
+          print "UNMATCHABLE: $File\n";
+          next;
+      }
+      # print "$File\nTy = $Type Date = '$Date' UID=$UID Rev=$Rev File = '$Filename'\n";
+      
+      if ($Filename =~ /^llvm/) {
+          if ($Type eq 'M') {        # Modified
+              $ModifiedFiles{$Filename} = 1;
+              $UsersCommitted{$UID} = 1;
+          } elsif ($Type eq 'A') {   # Added
+              $AddedFiles{$Filename} = 1;
+              $UsersCommitted{$UID} = 1;
+          } elsif ($Type eq 'R') {   # Removed
+              $RemovedFiles{$Filename} = 1;
+              $UsersCommitted{$UID} = 1;
+          } else {
+              $UsersUpdated{$UID} = 1;
+          }
+      }
+  }
 
-my $TestError = 1;
+  my $TestError = 1;
 
 }#!NOCVSSTATS
 
@@ -616,22 +584,22 @@ my $UserUpdateList = join "\n", sort keys %UsersUpdated;
 #
 ##############################################################
 if (!$NOCHECKOUT && !$NOBUILD) {
-    my $EXTRAFLAGS = "--enable-spec --with-objroot=.";
-    if ( $VERBOSE ){
-        print "CONFIGURE STAGE:\n";
-        print "(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) > $BuildLog 2>&1\n";
-    }
-    system "(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) > $BuildLog 2>&1";
-    if ( $VERBOSE ) 
-    { 
-			print "BUILD STAGE:\n";
-			print "(time -p $NICE $MAKECMD $MAKEOPTS) >> $BuildLog 2>&1\n";
-    }
-    # Build the entire tree, capturing the output into $BuildLog
-    system "(time -p $NICE $MAKECMD $MAKEOPTS) >> $BuildLog 2>&1";
+  my $EXTRAFLAGS = "--enable-spec --with-objroot=.";
+  if ( $VERBOSE ) {
+    print "CONFIGURE STAGE:\n";
+    print "(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) " . 
+          "> $BuildLog 2>&1\n";
+  }
+  system "(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) " . 
+         "> $BuildLog 2>&1";
+  if ( $VERBOSE ) { 
+    print "BUILD STAGE:\n";
+    print "(time -p $NICE $MAKECMD $MAKEOPTS) >> $BuildLog 2>&1\n";
+  }
+  # Build the entire tree, capturing the output into $BuildLog
+  system "(time -p $NICE $MAKECMD $MAKEOPTS) >> $BuildLog 2>&1";
 }
 
-
 ##############################################################
 #
 # Get some statistics about the build...
@@ -643,7 +611,11 @@ if (!$NOCHECKOUT && !$NOBUILD) {
 #my $NumLibraries   = scalar(grep(!/executable/, @Linked));
 #my $NumObjects     = `grep ']\: Compiling ' $BuildLog | wc -l` + 0;
 
+# Get the number of lines of source code. Must be here after the build is done
+# because countloc.sh uses the llvm-config script which must be built.
+my $LOC = `utils/countloc.sh -topdir $BuildDir/llvm`;
 
+# 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
@@ -661,96 +633,91 @@ $BuildTime=-1 unless $BuildTime;
 $BuildWallTime=-1 unless $BuildWallTime;
 
 my $BuildError = 0, $BuildStatus = "OK";
-if($NOBUILD){
-    $BuildStatus = "Skipped by user";
-    $BuildError = 1;
+if ($NOBUILD) {
+  $BuildStatus = "Skipped by user";
+  $BuildError = 1;
 }
 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"; }
+  `grep '^$MAKECMD: \*\*\*.*Stop.' $BuildLog | wc -l`+0) {
+  $BuildStatus = "Error: compilation aborted";
+  $BuildError = 1;
+  if( $VERBOSE) { print  "\n***ERROR BUILDING TREE\n\n"; }
 }
 if ($BuildError) { $NODEJAGNU=1; }
 
 my $a_file_sizes="";
 my $o_file_sizes="";
-if(!$BuildError){
-	if ( $VERBOSE ){
-        print "Organizing size of .o and .a files\n";
-    }
-	ChangeDir( "$BuildDir/llvm", "Build Directory" );
-	$afiles.= `find utils/ -iname '*.a' -ls`;
-	$afiles.= `find lib/ -iname '*.a' -ls`;
-	$afiles.= `find tools/ -iname '*.a' -ls`;
-	if($BUILDTYPE eq "release"){
-		$afiles.= `find Release/ -iname '*.a' -ls`;
-	}
-	else{
-		$afiles.= `find Debug/ -iname '*.a' -ls`;
-	}
-	
-	
-	$ofiles.= `find utils/ -iname '*.o' -ls`;
-	$ofiles.= `find lib/ -iname '*.o' -ls`;
-	$ofiles.= `find tools/ -iname '*.o' -ls`;
-	if($BUILDTYPE eq "release"){
-		$ofiles.= `find Release/ -iname '*.o' -ls`;
-	}
-	else{
-		$ofiles.= `find Debug/ -iname '*.o' -ls`;
-	}
-	
-	@AFILES = split "\n", $afiles;
-	$a_file_sizes="";
-	foreach $x (@AFILES){
-	  $x =~ m/.+\s+.+\s+.+\s+.+\s+.+\s+.+\s+(.+)\s+.+\s+.+\s+.+\s+(.+)/;
-	  $a_file_sizes.="$1 $2 $BUILDTYPE\n";
-	}	
-	@OFILES = split "\n", $ofiles;
-	$o_file_sizes="";
-	foreach $x (@OFILES){
-	  $x =~ m/.+\s+.+\s+.+\s+.+\s+.+\s+.+\s+(.+)\s+.+\s+.+\s+.+\s+(.+)/;
-	  $o_file_sizes.="$1 $2 $BUILDTYPE\n";
-	}
-}
-else{
-	$a_file_sizes="No data due to a bad build.";
-	$o_file_sizes="No data due to a bad build.";
+if (!$BuildError) {
+  print "Organizing size of .o and .a files\n" 
+    if ( $VERBOSE );
+  ChangeDir( "$BuildDir/llvm", "Build Directory" );
+  $afiles.= `find utils/ -iname '*.a' -ls`;
+  $afiles.= `find lib/ -iname '*.a' -ls`;
+  $afiles.= `find tools/ -iname '*.a' -ls`;
+  if($BUILDTYPE eq "release"){
+    $afiles.= `find Release/ -iname '*.a' -ls`;
+  } else {
+   $afiles.= `find Debug/ -iname '*.a' -ls`;
+  }
+  
+  $ofiles.= `find utils/ -iname '*.o' -ls`;
+  $ofiles.= `find lib/ -iname '*.o' -ls`;
+  $ofiles.= `find tools/ -iname '*.o' -ls`;
+  if($BUILDTYPE eq "release"){
+    $ofiles.= `find Release/ -iname '*.o' -ls`;
+  } else {
+    $ofiles.= `find Debug/ -iname '*.o' -ls`;
+  }
+  
+  @AFILES = split "\n", $afiles;
+  $a_file_sizes="";
+  foreach $x (@AFILES){
+    $x =~ m/.+\s+.+\s+.+\s+.+\s+.+\s+.+\s+(.+)\s+.+\s+.+\s+.+\s+(.+)/;
+    $a_file_sizes.="$1 $2 $BUILDTYPE\n";
+  }
+  @OFILES = split "\n", $ofiles;
+  $o_file_sizes="";
+  foreach $x (@OFILES){
+    $x =~ m/.+\s+.+\s+.+\s+.+\s+.+\s+.+\s+(.+)\s+.+\s+.+\s+.+\s+(.+)/;
+    $o_file_sizes.="$1 $2 $BUILDTYPE\n";
+  }
+} else {
+  $a_file_sizes="No data due to a bad build.";
+  $o_file_sizes="No data due to a bad build.";
 }
 
-
 ##############################################################
 #
 # Running dejagnu tests
 #
 ##############################################################
-my $DejangnuTestResults; # String containing the results of the dejagnu
+my $DejangnuTestResults=""; # String containing the results of the dejagnu
 my $dejagnu_output = "$DejagnuTestsLog";
-if(!$NODEJAGNU) {
-    if($VERBOSE) 
-    { 
-			print "DEJAGNU FEATURE/REGRESSION TEST STAGE:\n"; 
-			print "(time -p $MAKECMD $MAKEOPTS check) > $dejagnu_output 2>&1\n";
-    }
+if (!$NODEJAGNU) {
+  if($VERBOSE) { 
+    print "DEJAGNU FEATURE/REGRESSION TEST STAGE:\n"; 
+    print "(time -p $MAKECMD $MAKEOPTS check) > $dejagnu_output 2>&1\n";
+  }
 
-    #Run the feature and regression tests, results are put into testrun.sum
-    #Full log in testrun.log
-    system "(time -p $MAKECMD $MAKEOPTS check) > $dejagnu_output 2>&1";
-    
-    #Copy the testrun.log and testrun.sum to our webdir
-    CopyFile("test/testrun.log", $DejagnuLog);
-    CopyFile("test/testrun.sum", $DejagnuSum);
-    #can be done on server
-    $DejagnuTestResults = GetDejagnuTestResults($DejagnuSum, $DejagnuLog);
-    $unexpfail_tests = $DejagnuTestResults;
+  #Run the feature and regression tests, results are put into testrun.sum
+  #Full log in testrun.log
+  system "(time -p $MAKECMD $MAKEOPTS check) > $dejagnu_output 2>&1";
+  
+  #Copy the testrun.log and testrun.sum to our webdir
+  CopyFile("test/testrun.log", $DejagnuLog);
+  CopyFile("test/testrun.sum", $DejagnuSum);
+  #can be done on server
+  $DejagnuTestResults = GetDejagnuTestResults($DejagnuSum, $DejagnuLog);
+  $unexpfail_tests = $DejagnuTestResults;
 }
+
 #Extract time of dejagnu tests
 my $DejagnuTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$dejagnu_output";
 my $DejagnuTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$dejagnu_output";
 $DejagnuTime  = $DejagnuTimeU+$DejagnuTimeS;  # DejagnuTime = User+System
 $DejagnuWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$dejagnu_output"; 
-$DejagnuTestResults = "Dejagnu skipped by user choice." unless $DejagnuTestResults;
+$DejagnuTestResults = 
+  "Dejagnu skipped by user choice." unless $DejagnuTestResults;
 $DejagnuTime     = "0.0" unless $DejagnuTime;
 $DejagnuWallTime = "0.0" unless $DejagnuWallTime;
 
@@ -759,36 +726,34 @@ $DejagnuWallTime = "0.0" unless $DejagnuWallTime;
 # Get warnings from the build
 #
 ##############################################################
-if(!$NODEJAGNU){
-
-if ( $VERBOSE ) { print "BUILD INFORMATION COLLECTION STAGE\n"; }
-my @Warn = split "\n", `egrep 'warning:|Entering dir' $BuildLog`;
-my @Warnings;
-my $CurDir = "";
+if (!$NODEJAGNU) {
+  if ( $VERBOSE ) { print "BUILD INFORMATION COLLECTION STAGE\n"; }
+  my @Warn = split "\n", `egrep 'warning:|Entering dir' $BuildLog`;
+  my @Warnings;
+  my $CurDir = "";
 
-foreach $Warning (@Warn) {
+  foreach $Warning (@Warn) {
     if ($Warning =~ m/Entering directory \`([^\`]+)\'/) {
-	$CurDir = $1;                 # Keep track of directory warning is in...
-	if ($CurDir =~ m#$BuildDir/llvm/(.*)#) { # Remove buildir prefix if included
-	    $CurDir = $1;
-	}
+      $CurDir = $1;                 # Keep track of directory warning is in...
+      # Remove buildir prefix if included
+      if ($CurDir =~ m#$BuildDir/llvm/(.*)#) { $CurDir = $1; }
     } else {
-	push @Warnings, "$CurDir/$Warning";     # Add directory to warning...
+      push @Warnings, "$CurDir/$Warning";     # Add directory to warning...
     }
-}
-my $WarningsFile =  join "\n", @Warnings;
-$WarningsFile =~ s/:[0-9]+:/::/g;
+  }
+  my $WarningsFile =  join "\n", @Warnings;
+  $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";
+  # 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);
+  # 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);
 
-#my @TmpWarningsAdded = split "\n", $WarningsAdded; ~PJ on upgrade
-#my @TmpWarningsRemoved = split "\n", $WarningsRemoved; ~PJ on upgrade
+  #my @TmpWarningsAdded = split "\n", $WarningsAdded; ~PJ on upgrade
+  #my @TmpWarningsRemoved = split "\n", $WarningsRemoved; ~PJ on upgrade
 
 } #endif !NODEGAGNU
 
@@ -796,29 +761,31 @@ my ($WarningsAdded, $WarningsRemoved) = DiffFiles "-Warnings.txt";
 #
 # If we built the tree successfully, run the nightly programs tests...
 #
-# A set of tests to run is passed in (i.e. "SingleSource" "MultiSource" "External")
+# A set of tests to run is passed in (i.e. "SingleSource" "MultiSource" 
+# "External")
 #
 ##############################################################
 sub TestDirectory {
-	my $SubDir = shift;
-	
-	ChangeDir( "$BuildDir/llvm/projects/llvm-test/$SubDir", "Programs Test Subdirectory" ) || return ("", "");
-	
-	my $ProgramTestLog = "$Prefix-$SubDir-ProgramTest.txt";
-	
-	# Run the programs tests... creating a report.nightly.csv file
-	if (!$NOTEST) {
-		if( $VERBOSE) { 
-		  print "$MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv ".
-                "TEST=nightly > $ProgramTestLog 2>&1\n"; 
-        }
-		system "$MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv ".
+  my $SubDir = shift;
+  
+  ChangeDir( "$BuildDir/llvm/projects/llvm-test/$SubDir", 
+             "Programs Test Subdirectory" ) || return ("", "");
+  
+  my $ProgramTestLog = "$Prefix-$SubDir-ProgramTest.txt";
+  
+  # Run the programs tests... creating a report.nightly.csv file
+  if (!$NOTEST) {
+    if( $VERBOSE) { 
+      print "$MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv ".
+            "TEST=nightly > $ProgramTestLog 2>&1\n"; 
+    }
+    system "$MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv ".
            "TEST=nightly > $ProgramTestLog 2>&1";
-	  $llcbeta_options=`$MAKECMD print-llcbeta-option`;
-	} 
-    
+    $llcbeta_options=`$MAKECMD print-llcbeta-option`;
+  } 
+
   my $ProgramsTable;
-  if (`grep '^$MAKECMD\[^:]: .*Error' $ProgramTestLog | wc -l` + 0){
+  if (`grep '^$MAKECMD\[^:]: .*Error' $ProgramTestLog | wc -l` + 0) {
     $TestError = 1;
     $ProgramsTable="Error running test $SubDir\n";
     print "ERROR TESTING\n";
@@ -828,46 +795,59 @@ sub TestDirectory {
     print "ERROR TESTING\n";
   } else {
     $TestError = 0;
-    #
-    # Create a list of the tests which were run...
-    #
-    system "egrep 'TEST-(PASS|FAIL)' < $ProgramTestLog ".
-           "| sort > $Prefix-multisourceprogramstable.txt";
+  #
+  # Create a list of the tests which were run...
+  #
+  system "egrep 'TEST-(PASS|FAIL)' < $ProgramTestLog ".
+         "| sort > $Prefix-$SubDir-Tests.txt";
   }
   $ProgramsTable = ReadFile "report.nightly.csv";
 
   ChangeDir( "../../..", "Programs Test Parent Directory" );
   return ($ProgramsTable, $llcbeta_options);
-}
+} #end sub TestDirectory
 
+##############################################################
+#
+# Calling sub TestDirectory
+#
+##############################################################
 if (!$BuildError) {
-	if ( $VERBOSE ) {
+  if ( $VERBOSE ) {
      print "SingleSource TEST STAGE\n";
-	}
-	($SingleSourceProgramsTable, $llcbeta_options) = TestDirectory("SingleSource");
-	WriteFile "$Prefix-singlesourceprogramstable.txt", $SingleSourceProgramsTable;
+  }
+  ($SingleSourceProgramsTable, $llcbeta_options) = 
+    TestDirectory("SingleSource");
+  WriteFile "$Prefix-SingleSource-Performance.txt", $SingleSourceProgramsTable;
   if ( $VERBOSE ) {
-     print "MultiSource TEST STAGE\n";
-	}
-	($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource");
-	WriteFile "$Prefix-multisourceprogramstable.txt", $MultiSourceProgramsTable;
-	if ( ! $NOEXTERNALS ) {
-	  if ( $VERBOSE ) {
-		  print "External TEST STAGE\n";
-	  }
-	  ($ExternalProgramsTable, $llcbeta_options) = TestDirectory("External");
-	  WriteFile "$Prefix-externalprogramstable.txt", $ExternalProgramsTable;
-	  system "cat $Prefix-singlesourceprogramstable.txt $Prefix-multisourceprogramstable.txt ".
-		     " $Prefix-externalprogramstable.txt | sort > $Prefix-Tests.txt";
-	} else {
-	  $ExternalProgramsTable = "External TEST STAGE SKIPPED\n";
-	  if ( $VERBOSE ) {
-		  print "External TEST STAGE SKIPPED\n";
-	  }
-	  system "cat $Prefix-singlesourceprogramstable.txt $Prefix-multisourceprogramstable.txt ".
-		     " | sort > $Prefix-Tests.txt";
-	}
-	WriteFile "$Prefix-externalprogramstable.txt", $ExternalProgramsTable;
+    print "MultiSource TEST STAGE\n";
+  }
+  ($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource");
+  WriteFile "$Prefix-MultiSource-Performance.txt", $MultiSourceProgramsTable;
+  if ( ! $NOEXTERNALS ) {
+    if ( $VERBOSE ) {
+      print "External TEST STAGE\n";
+    }
+    ($ExternalProgramsTable, $llcbeta_options) = TestDirectory("External");
+    WriteFile "$Prefix-External-Performance.txt", $ExternalProgramsTable;
+    system "cat $Prefix-SingleSource-Tests.txt " . 
+               "$Prefix-MultiSource-Tests.txt ".
+               "$Prefix-External-Tests.txt | sort > $Prefix-Tests.txt";
+    system "cat $Prefix-SingleSource-Performance.txt " . 
+               "$Prefix-MultiSource-Performance.txt ".
+               "$Prefix-External-Performance.txt | sort > $Prefix-Performance.txt";
+  } else {
+    $ExternalProgramsTable = "External TEST STAGE SKIPPED\n";
+    if ( $VERBOSE ) {
+      print "External TEST STAGE SKIPPED\n";
+    }
+    system "cat $Prefix-SingleSource-Tests.txt " . 
+               "$Prefix-MultiSource-Tests.txt ".
+               " | sort > $Prefix-Tests.txt";
+    system "cat $Prefix-SingleSource-Performance.txt " . 
+               "$Prefix-MultiSource-Performance.txt ".
+               " | sort > $Prefix-Performance.txt";
+  }
 }
 
 ##############################################################
@@ -877,29 +857,25 @@ if (!$BuildError) {
 #
 #
 ##############################################################
-my $dejagnu = ReadFile $DejagnuSum;
-my @DEJAGNU = split "\n", $dejagnu;
-my $dejagnu_test_list="";
+my $dejagnu_test_list = ReadFile "$Prefix-Tests.txt";
+my @DEJAGNU = split "\n", $dejagnu_test_list;
 
 my $passes="",
 my $fails="";
 my $xfails="";
 
 if(!$NODEJAGNU) {
-	for($x=0; $x<@DEJAGNU; $x++){
-		if($DEJAGNU[$x] =~ m/^PASS:/){
-			$passes.="$DEJAGNU[$x]\n";
-			$dejagnu_test_list.="$DEJAGNU[$x]\n";
-		}
-		elsif($DEJAGNU[$x] =~ m/^FAIL:/){
-			$fails.="$DEJAGNU[$x]\n";
-			$dejagnu_test_list.="$DEJAGNU[$x]\n";
-		}
-		elsif($DEJAGNU[$x] =~ m/^XFAIL:/){
-			$xfails.="$DEJAGNU[$x]\n";
-			$dejagnu_test_list.="$DEJAGNU[$x]\n";
-		}
-	}
+  for ($x=0; $x<@DEJAGNU; $x++) {
+    if ($DEJAGNU[$x] =~ m/^PASS:/) {
+      $passes.="$DEJAGNU[$x]\n";
+    }
+    elsif ($DEJAGNU[$x] =~ m/^FAIL:/) {
+      $fails.="$DEJAGNU[$x]\n";
+    }
+    elsif ($DEJAGNU[$x] =~ m/^XFAIL:/) {
+      $xfails.="$DEJAGNU[$x]\n";
+    }
+  }
 }
 
 ##############################################################
@@ -914,18 +890,22 @@ if (!$BuildError) {
   $MachCodeSize) = ("","","","","","","");
   if (!$NORUNNINGTESTS) {
     ChangeDir( "$BuildDir/llvm/projects/llvm-test/MultiSource/Benchmarks/Olden",
-		   "Olden Test Directory");
+                "Olden Test Directory");
 
     # Clean out previous results...
     system "$NICE $MAKECMD $MAKEOPTS clean > /dev/null 2>&1";
-	
+
     # Run the nightly test in this directory, with LARGE_PROBLEM_SIZE and
     # GET_STABLE_NUMBERS enabled!
-    if( $VERBOSE ) { print "$MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv.out TEST=nightly " .
-			     " LARGE_PROBLEM_SIZE=1 GET_STABLE_NUMBERS=1 > /dev/null 2>&1\n"; }
-	system "$MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv.out TEST=nightly " .
-	    " LARGE_PROBLEM_SIZE=1 GET_STABLE_NUMBERS=1 > /dev/null 2>&1";
-	system "cp report.nightly.csv $OldenTestsLog";
+    if( $VERBOSE ) { 
+      print "$MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv.out " .
+            "TEST=nightly  LARGE_PROBLEM_SIZE=1 GET_STABLE_NUMBERS=1 " .
+            "> /dev/null 2>&1\n"; 
+    }
+    system "$MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv.out " .
+           "TEST=nightly LARGE_PROBLEM_SIZE=1 GET_STABLE_NUMBERS=1 " .
+           "> /dev/null 2>&1";
+    system "cp report.nightly.csv $OldenTestsLog";
   }  
 }
 
@@ -942,7 +922,6 @@ $endtime = `date "+20%y-%m-%d %H:%M:%S"`;
 # Place all the logs neatly into one humungous file
 #
 ##############################################################
-
 if ( $VERBOSE ) { print "PREPARING LOGS TO BE SENT TO SERVER\n"; }
 
 $machine_data = "uname: ".`uname -a`. 
@@ -977,17 +956,14 @@ my $dejagnulog_full;
 $dejagnulog_full = join("\n", @DEJAGNULOG_FULL);
 
 my $gcc_version_long="";
-if($GCCPATH ne ""){
+if ($GCCPATH ne "") {
   $gcc_version_long = `$GCCPATH/gcc --version`;
-}
-else{
+} else {
   $gcc_version_long = `gcc --version`;
 }
 @GCC_VERSION = split '\n', $gcc_version_long;
 my $gcc_version = $GCC_VERSION[0];
 
-my $all_tests = ReadFile "$Prefix-Tests.txt";
-
 ##############################################################
 #
 # Send data via a post request
@@ -996,61 +972,59 @@ my $all_tests = ReadFile "$Prefix-Tests.txt";
 
 if ( $VERBOSE ) { print "SEND THE DATA VIA THE POST REQUEST\n"; }
 
-
-my $host = "llvm.org";
-my $file = "/nightlytest/NightlyTestAccept.cgi";
-my %hash_of_data = ('machine_data' => $machine_data,
-	'build_data' => $build_data,
-	'gcc_version' => $gcc_version,
-	'nickname' => $nickname,
-	'dejagnutime_wall' => $DejagnuWallTime,
-	'dejagnutime_cpu' => $DejagnuTime,
-	'cvscheckouttime_wall' => $CVSCheckoutTime_Wall,
-	'cvscheckouttime_cpu' => $CVSCheckoutTime_CPU,
-	'configtime_wall' => $ConfigWallTime,
-	'configtime_cpu'=> $ConfigTime,
-	'buildtime_wall' => $BuildWallTime,
-	'buildtime_cpu' => $BuildTime,
-	'warnings' => $WarningsFile,
-	'cvsusercommitlist' => $UserCommitList,
-	'cvsuserupdatelist' => $UserUpdateList,
-	'cvsaddedfiles' => $CVSAddedFiles,
-	'cvsmodifiedfiles' => $CVSModifiedFiles,
-	'cvsremovedfiles' => $CVSRemovedFiles,
-	'lines_of_code' => $LOC,
-	'cvs_file_count' => $NumFilesInCVS,
-	'cvs_dir_count' => $NumDirsInCVS,
-	'buildstatus' => $BuildStatus,
-	'singlesource_programstable' => $SingleSourceProgramsTable,
-	'multisource_programstable' => $MultiSourceProgramsTable,
-	'externalsource_programstable' => $ExternalProgramsTable,
-	'llcbeta_options' => $multisource_llcbeta_options,
-	'warnings_removed' => $WarningsRemoved,
-	'warnings_added' => $WarningsAdded,
-	'passing_tests' => $passes,
-	'expfail_tests' => $xfails,
-	'unexpfail_tests' => $fails,
-	'all_tests' => $dejagnu_test_list,
-	'new_tests' => "",
-	'removed_tests' => "",
-	'dejagnutests_log' => $dejagnutests_log,
-	'dejagnutests_sum' => $dejagnutests_sum,
-	'starttime' => $starttime,
-	'endtime' => $endtime,
-	'o_file_sizes' => $o_file_sizes,
-	'a_file_sizes' => $a_file_sizes);
+my %hash_of_data = (
+  'machine_data' => $machine_data,
+  'build_data' => $build_data,
+  'gcc_version' => $gcc_version,
+  'nickname' => $nickname,
+  'dejagnutime_wall' => $DejagnuWallTime,
+  'dejagnutime_cpu' => $DejagnuTime,
+  'cvscheckouttime_wall' => $CVSCheckoutTime_Wall,
+  'cvscheckouttime_cpu' => $CVSCheckoutTime_CPU,
+  'configtime_wall' => $ConfigWallTime,
+  'configtime_cpu'=> $ConfigTime,
+  'buildtime_wall' => $BuildWallTime,
+  'buildtime_cpu' => $BuildTime,
+  'warnings' => $WarningsFile,
+  'cvsusercommitlist' => $UserCommitList,
+  'cvsuserupdatelist' => $UserUpdateList,
+  'cvsaddedfiles' => $CVSAddedFiles,
+  'cvsmodifiedfiles' => $CVSModifiedFiles,
+  'cvsremovedfiles' => $CVSRemovedFiles,
+  'lines_of_code' => $LOC,
+  'cvs_file_count' => $NumFilesInCVS,
+  'cvs_dir_count' => $NumDirsInCVS,
+  'buildstatus' => $BuildStatus,
+  'singlesource_programstable' => $SingleSourceProgramsTable,
+  'multisource_programstable' => $MultiSourceProgramsTable,
+  'externalsource_programstable' => $ExternalProgramsTable,
+  'llcbeta_options' => $multisource_llcbeta_options,
+  'warnings_removed' => $WarningsRemoved,
+  'warnings_added' => $WarningsAdded,
+  'passing_tests' => $passes,
+  'expfail_tests' => $xfails,
+  'unexpfail_tests' => $fails,
+  'all_tests' => $dejagnu_test_list,
+  'new_tests' => "",
+  'removed_tests' => "",
+  'dejagnutests_results' => $DejagnuTestResults,
+  'dejagnutests_log' => $dejagnulog_full,
+  'starttime' => $starttime,
+  'endtime' => $endtime,
+  'o_file_sizes' => $o_file_sizes,
+  'a_file_sizes' => $a_file_sizes
+);
 
 $TESTING = 0;
 
-if($TESTING){
-    print "============================\n";
-    foreach $x(keys %hash_of_data){
-        print "$x  => $hash_of_data{$x}\n";
-    }
-}
-else{
-    my $response = SendData $host,$file,\%hash_of_data;
-    if( $VERBOSE) { print "============================\n$response"; }
+if ($TESTING) {
+  print "============================\n";
+  foreach $x(keys %hash_of_data){
+      print "$x  => $hash_of_data{$x}\n";
+  }
+} else {
+  my $response = SendData $SUBMITSERVER,$SUBMITSCRIPT,\%hash_of_data;
+  if( $VERBOSE) { print "============================\n$response"; }
 }
 
 ##############################################################
@@ -1058,7 +1032,7 @@ else{
 # Remove the cvs tree...
 #
 ##############################################################
-system ( "$NICE rm -rf $BuildDir") if (!$NOCHECKOUT and !$NOREMOVE);
-system ( "$NICE rm -rf $WebDir") if (!$NOCHECKOUT and !$NOREMOVE and !$NOREMOVERESULTS);
-
-
+system ( "$NICE rm -rf $BuildDir") 
+  if (!$NOCHECKOUT and !$NOREMOVE);
+system ( "$NICE rm -rf $WebDir") 
+  if (!$NOCHECKOUT and !$NOREMOVE and !$NOREMOVERESULTS);