maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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.

llvm-svn: 29829
This commit is contained in:
Patrick Jenkins 2006-08-22 18:11:19 +00:00
parent ffa6f2581d
commit 06725191ab
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
llvm/utils/NewNightlyTest.pl
View File

@ -769,7 +769,6 @@ if (!$NODEJAGNU) {
##############################################################
sub TestDirectory {
my $SubDir = shift;
ChangeDir( "$BuildDir/llvm/projects/llvm-test/$SubDir",
"Programs Test Subdirectory" ) || return ("", "");
@ -850,7 +849,6 @@ if (!$BuildError) {
"$Prefix-MultiSource-Performance.txt ".
" | sort > $Prefix-Performance.txt";
}
}
##############################################################
#
@ -861,10 +859,7 @@ if (!$BuildError) {
##############################################################
my $dejagnu_test_list = ReadFile "$Prefix-Tests.txt";
my @DEJAGNU = split "\n", $dejagnu_test_list;
my $passes="",
my $fails="";
my $xfails="";
my ($passes, $fails, $xfails) = "";
if(!$NODEJAGNU) {
for ($x=0; $x<@DEJAGNU; $x++) {
@ -880,6 +875,9 @@ if(!$NODEJAGNU) {
}
}
} #end if !$BuildError
##############################################################
#
# If we built the tree successfully, runs of the Olden suite with
@ -947,15 +945,6 @@ my (@DEJAGNU_LOG, @DEJAGNU_SUM, @DEJAGNULOG_FULL, @GCC_VERSION);
my ($dejagnutests_log ,$dejagnutests_sum, $dejagnulog_full) = "";
my ($gcc_version, $gcc_version_long) = "";
if(!$BuildError){
@DEJAGNU_LOG = ReadFile "$DejagnuLog";
@DEJAGNU_SUM = ReadFile "$DejagnuSum";
$dejagnutests_log = join("\n", @DEJAGNU_LOG);
$dejagnutests_sum = join("\n", @DEJAGNU_SUM);
@DEJAGNULOG_FULL = ReadFile "$DejagnuTestsLog";
$dejagnulog_full = join("\n", @DEJAGNULOG_FULL);
$gcc_version_long="";
if ($GCCPATH ne "") {
$gcc_version_long = `$GCCPATH/gcc --version`;
@ -964,6 +953,15 @@ if(!$BuildError){
}
@GCC_VERSION = split '\n', $gcc_version_long;
$gcc_version = $GCC_VERSION[0];
if(!$BuildError){
@DEJAGNU_LOG = ReadFile "$DejagnuLog";
@DEJAGNU_SUM = ReadFile "$DejagnuSum";
$dejagnutests_log = join("\n", @DEJAGNU_LOG);
$dejagnutests_sum = join("\n", @DEJAGNU_SUM);
@DEJAGNULOG_FULL = ReadFile "$DejagnuTestsLog";
$dejagnulog_full = join("\n", @DEJAGNULOG_FULL);
}
##############################################################