Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.56 -> 1.57
---
Log message:
Corrected an error that was introduced yesterday that caused the GCC
version to be left blank if the build failed.
Also corrected a problem where if the build failed the nightly tester
would still try to read the results of the Dejagnutests log even
though it didnt exist.
---
Diffs of the changes: (+35 -37)
NewNightlyTest.pl | 72 ++++++++++++++++++++++++++----------------------------
1 files changed, 35 insertions(+), 37 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.56 llvm/utils/NewNightlyTest.pl:1.57
--- llvm/utils/NewNightlyTest.pl:1.56 Mon Aug 21 15:45:57 2006
+++ llvm/utils/NewNightlyTest.pl Tue Aug 22 13:11:19 2006
@@ -768,8 +768,7 @@
#
##############################################################
sub TestDirectory {
- my $SubDir = shift;
-
+ my $SubDir = shift;
ChangeDir( "$BuildDir/llvm/projects/llvm-test/$SubDir",
"Programs Test Subdirectory" ) || return ("", "");
@@ -850,35 +849,34 @@
"$Prefix-MultiSource-Performance.txt ".
" | sort > $Prefix-Performance.txt";
}
-}
-
-##############################################################
-#
-#
-# gathering tests added removed broken information here
-#
-#
-##############################################################
-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";
- }
- elsif ($DEJAGNU[$x] =~ m/^FAIL:/) {
- $fails.="$DEJAGNU[$x]\n";
- }
- elsif ($DEJAGNU[$x] =~ m/^XFAIL:/) {
- $xfails.="$DEJAGNU[$x]\n";
+ ##############################################################
+ #
+ #
+ # gathering tests added removed broken information here
+ #
+ #
+ ##############################################################
+ my $dejagnu_test_list = ReadFile "$Prefix-Tests.txt";
+ my @DEJAGNU = split "\n", $dejagnu_test_list;
+ my ($passes, $fails, $xfails) = "";
+
+ if(!$NODEJAGNU) {
+ 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";
+ }
}
}
-}
+
+} #end if !$BuildError
+
##############################################################
#
@@ -947,6 +945,15 @@
my ($dejagnutests_log ,$dejagnutests_sum, $dejagnulog_full) = "";
my ($gcc_version, $gcc_version_long) = "";
+$gcc_version_long="";
+if ($GCCPATH ne "") {
+ $gcc_version_long = `$GCCPATH/gcc --version`;
+} else {
+ $gcc_version_long = `gcc --version`;
+}
[EMAIL PROTECTED] = split '\n', $gcc_version_long;
+$gcc_version = $GCC_VERSION[0];
+
if(!$BuildError){
@DEJAGNU_LOG = ReadFile "$DejagnuLog";
@DEJAGNU_SUM = ReadFile "$DejagnuSum";
@@ -955,15 +962,6 @@
@DEJAGNULOG_FULL = ReadFile "$DejagnuTestsLog";
$dejagnulog_full = join("\n", @DEJAGNULOG_FULL);
-
- $gcc_version_long="";
- if ($GCCPATH ne "") {
- $gcc_version_long = `$GCCPATH/gcc --version`;
- } else {
- $gcc_version_long = `gcc --version`;
- }
- @GCC_VERSION = split '\n', $gcc_version_long;
- $gcc_version = $GCC_VERSION[0];
}
##############################################################
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
