Changed the call to countloc.sh so that the correct topdirectory of the llvm build is set.

llvm-svn: 29736

1 files changed, 19 insertions, 20 deletions

diff --git a/llvm/utils/NewNightlyTest.pl b/llvm/utils/NewNightlyTest.pl
index edbbdca2252..21492e4d258 100755
--- a/llvm/utils/NewNightlyTest.pl
+++ b/llvm/utils/NewNightlyTest.pl
@@ -117,7 +117,7 @@ $NOTEST=0;
 $NORUNNINGTESTS=0;
 $MAKECMD="make";
 $SUBMITSERVER = "llvm.org";
-$SUBMITSCRIPT = "/nightlytest/NightlyTestAccept.cgi";
+$SUBMITSCRIPT = "/nightlytest/NightlyTestAccept2.cgi";
 
 while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
   shift;
@@ -638,7 +638,7 @@ if (!$NOCHECKOUT && !$NOBUILD) {
 
 # 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`;
+my $LOC = `utils/countloc.sh -topdir $BuildDir/llvm`;
 
 # Get the time taken by the configure script
 my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$BuildLog";
@@ -824,7 +824,7 @@ sub TestDirectory {
   # Create a list of the tests which were run...
   #
   system "egrep 'TEST-(PASS|FAIL)' < $ProgramTestLog ".
-         "| sort > $Prefix-multisourceprogramstable.txt";
+         "| sort > $Prefix-$SubDir-Tests.txt";
   }
   $ProgramsTable = ReadFile "report.nightly.csv";
 
@@ -838,31 +838,36 @@ if (!$BuildError) {
   }
   ($SingleSourceProgramsTable, $llcbeta_options) = 
     TestDirectory("SingleSource");
-  WriteFile "$Prefix-singlesourceprogramstable.txt", $SingleSourceProgramsTable;
+  WriteFile "$Prefix-SingleSource-Performance.txt", $SingleSourceProgramsTable;
   if ( $VERBOSE ) {
      print "MultiSource TEST STAGE\n";
   }
   ($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource");
-  WriteFile "$Prefix-multisourceprogramstable.txt", $MultiSourceProgramsTable;
+  WriteFile "$Prefix-MultiSource-Performance.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";
+    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-singlesourceprogramstable.txt " . 
-               "$Prefix-multisourceprogramstable.txt ".
+    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";
   }
-  WriteFile "$Prefix-externalprogramstable.txt", $ExternalProgramsTable;
 }
 
 ##############################################################
@@ -872,9 +877,8 @@ 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="";
@@ -884,15 +888,12 @@ 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";
     }
   }
 }
@@ -983,8 +984,6 @@ if ($GCCPATH ne "") {
 @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