OSchip
/
llvm-project
mirror of https://github.com/THU-DSP-LAB/llvm-project.git
13
0
Fork 6
Code Issues Packages Projects Releases Wiki Activity

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

llvm-svn: 29736
This commit is contained in:
Patrick Jenkins 2006-08-16 22:18:41 +00:00
parent 941015e192
commit 2bc1934fb1
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
llvm/utils/NewNightlyTest.pl
View File

@ -117,7 +117,7 @@ $NOTEST=0;
$NORUNNINGTESTS=0; $NORUNNINGTESTS=0;
$MAKECMD="make"; $MAKECMD="make";
$SUBMITSERVER = "llvm.org"; $SUBMITSERVER = "llvm.org";
$SUBMITSCRIPT = "/nightlytest/NightlyTestAccept.cgi"; $SUBMITSCRIPT = "/nightlytest/NightlyTestAccept2.cgi";
while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) { while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
shift; shift;
@ -638,7 +638,7 @@ if (!$NOCHECKOUT && !$NOBUILD) {
# Get the number of lines of source code. Must be here after the build is done # 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. # 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 # Get the time taken by the configure script
my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$BuildLog"; my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$BuildLog";
@ -824,7 +824,7 @@ sub TestDirectory {
# Create a list of the tests which were run... # Create a list of the tests which were run...
# #
system "egrep 'TEST-(PASS|FAIL)' < $ProgramTestLog ". system "egrep 'TEST-(PASS|FAIL)' < $ProgramTestLog ".
"| sort > $Prefix-multisourceprogramstable.txt"; "| sort > $Prefix-$SubDir-Tests.txt";
} }
$ProgramsTable = ReadFile "report.nightly.csv"; $ProgramsTable = ReadFile "report.nightly.csv";
@ -838,31 +838,36 @@ if (!$BuildError) {
} }
($SingleSourceProgramsTable, $llcbeta_options) = ($SingleSourceProgramsTable, $llcbeta_options) =
TestDirectory("SingleSource"); TestDirectory("SingleSource");
WriteFile "$Prefix-singlesourceprogramstable.txt", $SingleSourceProgramsTable; WriteFile "$Prefix-SingleSource-Performance.txt", $SingleSourceProgramsTable;
if ( $VERBOSE ) { if ( $VERBOSE ) {
print "MultiSource TEST STAGE\n"; print "MultiSource TEST STAGE\n";
} }
($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource"); ($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource");
WriteFile "$Prefix-multisourceprogramstable.txt", $MultiSourceProgramsTable; WriteFile "$Prefix-MultiSource-Performance.txt", $MultiSourceProgramsTable;
if ( ! $NOEXTERNALS ) { if ( ! $NOEXTERNALS ) {
if ( $VERBOSE ) { if ( $VERBOSE ) {
print "External TEST STAGE\n"; print "External TEST STAGE\n";
} }
($ExternalProgramsTable, $llcbeta_options) = TestDirectory("External"); ($ExternalProgramsTable, $llcbeta_options) = TestDirectory("External");
WriteFile "$Prefix-externalprogramstable.txt", $ExternalProgramsTable; WriteFile "$Prefix-External-Performance.txt", $ExternalProgramsTable;
system "cat $Prefix-singlesourceprogramstable.txt " . system "cat $Prefix-SingleSource-Tests.txt " .
"$Prefix-multisourceprogramstable.txt ". "$Prefix-MultiSource-Tests.txt ".
"$Prefix-externalprogramstable.txt | sort > $Prefix-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 { } else {
$ExternalProgramsTable = "External TEST STAGE SKIPPED\n"; $ExternalProgramsTable = "External TEST STAGE SKIPPED\n";
if ( $VERBOSE ) { if ( $VERBOSE ) {
print "External TEST STAGE SKIPPED\n"; print "External TEST STAGE SKIPPED\n";
} }
system "cat $Prefix-singlesourceprogramstable.txt " . system "cat $Prefix-SingleSource-Tests.txt " .
"$Prefix-multisourceprogramstable.txt ". "$Prefix-MultiSource-Tests.txt ".
" | sort > $Prefix-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_test_list = ReadFile "$Prefix-Tests.txt";
my @DEJAGNU = split "\n", $dejagnu; my @DEJAGNU = split "\n", $dejagnu_test_list;
my $dejagnu_test_list="";
my $passes="", my $passes="",
my $fails=""; my $fails="";
@ -884,15 +888,12 @@ if(!$NODEJAGNU) {
for ($x=0; $x<@DEJAGNU; $x++) { for ($x=0; $x<@DEJAGNU; $x++) {
if ($DEJAGNU[$x] =~ m/^PASS:/) { if ($DEJAGNU[$x] =~ m/^PASS:/) {
$passes.="$DEJAGNU[$x]\n"; $passes.="$DEJAGNU[$x]\n";
$dejagnu_test_list.="$DEJAGNU[$x]\n";
} }
elsif ($DEJAGNU[$x] =~ m/^FAIL:/) { elsif ($DEJAGNU[$x] =~ m/^FAIL:/) {
$fails.="$DEJAGNU[$x]\n"; $fails.="$DEJAGNU[$x]\n";
$dejagnu_test_list.="$DEJAGNU[$x]\n";
} }
elsif ($DEJAGNU[$x] =~ m/^XFAIL:/) { elsif ($DEJAGNU[$x] =~ m/^XFAIL:/) {
$xfails.="$DEJAGNU[$x]\n"; $xfails.="$DEJAGNU[$x]\n";
$dejagnu_test_list.="$DEJAGNU[$x]\n";
} }
} }
} }
@ -983,8 +984,6 @@ if ($GCCPATH ne "") {
@GCC_VERSION = split '\n', $gcc_version_long; @GCC_VERSION = split '\n', $gcc_version_long;
my $gcc_version = $GCC_VERSION[0]; my $gcc_version = $GCC_VERSION[0];
my $all_tests = ReadFile "$Prefix-Tests.txt";
############################################################## ##############################################################
# #
# Send data via a post request # Send data via a post request