[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Patrick Jenkins
pjenkins at apple.com
Wed Aug 16 15:32:35 PDT 2006
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.52 -> 1.53
---
Log message:
My last commit added some experimental features I have been working on. This commit rolls those back.
---
Diffs of the changes: (+19 -18)
NewNightlyTest.pl | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.52 llvm/utils/NewNightlyTest.pl:1.53
--- llvm/utils/NewNightlyTest.pl:1.52 Wed Aug 16 17:18:41 2006
+++ llvm/utils/NewNightlyTest.pl Wed Aug 16 17:32:20 2006
@@ -117,7 +117,7 @@
$NORUNNINGTESTS=0;
$MAKECMD="make";
$SUBMITSERVER = "llvm.org";
-$SUBMITSCRIPT = "/nightlytest/NightlyTestAccept2.cgi";
+$SUBMITSCRIPT = "/nightlytest/NightlyTestAccept.cgi";
while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
shift;
@@ -824,7 +824,7 @@
# Create a list of the tests which were run...
#
system "egrep 'TEST-(PASS|FAIL)' < $ProgramTestLog ".
- "| sort > $Prefix-$SubDir-Tests.txt";
+ "| sort > $Prefix-multisourceprogramstable.txt";
}
$ProgramsTable = ReadFile "report.nightly.csv";
@@ -838,36 +838,31 @@
}
($SingleSourceProgramsTable, $llcbeta_options) =
TestDirectory("SingleSource");
- WriteFile "$Prefix-SingleSource-Performance.txt", $SingleSourceProgramsTable;
+ WriteFile "$Prefix-singlesourceprogramstable.txt", $SingleSourceProgramsTable;
if ( $VERBOSE ) {
print "MultiSource TEST STAGE\n";
}
($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource");
- WriteFile "$Prefix-MultiSource-Performance.txt", $MultiSourceProgramsTable;
+ WriteFile "$Prefix-multisourceprogramstable.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";
+ 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-SingleSource-Tests.txt " .
- "$Prefix-MultiSource-Tests.txt ".
+ system "cat $Prefix-singlesourceprogramstable.txt " .
+ "$Prefix-multisourceprogramstable.txt ".
" | sort > $Prefix-Tests.txt";
- system "cat $Prefix-SingleSource-Performance.txt " .
- "$Prefix-MultiSource-Performance.txt ".
- " | sort > $Prefix-Performance.txt";
}
+ WriteFile "$Prefix-externalprogramstable.txt", $ExternalProgramsTable;
}
##############################################################
@@ -877,8 +872,9 @@
#
#
##############################################################
-my $dejagnu_test_list = ReadFile "$Prefix-Tests.txt";
-my @DEJAGNU = split "\n", $dejagnu_test_list;
+my $dejagnu = ReadFile $DejagnuSum;
+my @DEJAGNU = split "\n", $dejagnu;
+my $dejagnu_test_list="";
my $passes="",
my $fails="";
@@ -888,12 +884,15 @@
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";
}
}
}
@@ -984,6 +983,8 @@
@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
More information about the llvm-commits
mailing list