6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-07 12:28:24 +00:00
Code Issues Projects Releases Wiki Activity

When the ability to gather .a and .o file sizes was added, it changed the directory the perl script was in so when we tried to run dejagnu tests, everything failed.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29269 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Patrick Jenkins
2006-07-23 21:38:07 +00:00
parent b76ea74845
commit 169357e3dd
1 changed files with 32 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
utils/NewNightlyTest.pl
View File

@@ -200,7 +200,7 @@ my $CVSLog = "$Prefix-CVS-Log.txt";
my $OldenTestsLog = "$Prefix-Olden-tests.txt";
my $SingleSourceLog = "$Prefix-SingleSource-ProgramTest.txt.gz";
my $MultiSourceLog = "$Prefix-MultiSource-ProgramTest.txt.gz";
my $ExternalLog = "$Prefix-External-ProgramTest.txt.gz";
my $ExternalLog = "$Prefix-External-ProgramTest.txt.gz"
my $DejagnuLog = "$Prefix-Dejagnu-testrun.log";
my $DejagnuSum = "$Prefix-Dejagnu-testrun.sum";
my $DejagnuTestsLog = "$Prefix-DejagnuTests-Log.txt";
@@ -278,7 +278,8 @@ sub ChangeDir { # directory, logical name
my ($dir,$name) = @_;
chomp($dir);
if ( $VERBOSE ) { print "Changing To: $name ($dir)\n"; }
chdir($dir) || die "Cannot change directory to: $name ($dir) ";
chdir($dir) || (print "Cannot change directory to: $name ($dir) " && return -1);
return 0;
}
#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -610,28 +611,6 @@ if (!$NOCHECKOUT && !$NOBUILD) {
#my $NumLibraries = scalar(grep(!/executable/, @Linked));
#my $NumObjects = `grep ']\: Compiling ' $BuildLog | wc -l` + 0;
my $a_file_sizes="";
my $o_file_sizes="";
if(!$BuildError){
if ( $VERBOSE ){
print "Organizing size of .o and .a files\n";
}
ChangeDir( "$BuildDir", "Build Directory" );
$afiles = `find . -iname '*.a' -ls`;
$ofiles = `find . -iname '*.o' -ls`;
@AFILES = split "\n", $afiles;
$a_file_sizes="";
foreach $x (@AFILES){
$x =~ m/.+\s+.+\s+.+\s+.+\s+.+\s+.+\s+(.+)\s+.+\s+.+\s+.+\s+(.+)/;
$a_file_sizes.="$1 $2\n";
}
@OFILES = split "\n", $ofiles;
$o_file_sizes="";
foreach $x (@OFILES){
$x =~ m/.+\s+.+\s+.+\s+.+\s+.+\s+.+\s+(.+)\s+.+\s+.+\s+.+\s+(.+)/;
$o_file_sizes.="$1 $2\n";
}
}
my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$BuildLog";
my $ConfigTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$BuildLog";
@@ -662,6 +641,34 @@ elsif (`grep '^make[^:]*: .*Error' $BuildLog | wc -l` + 0 ||
}
if ($BuildError) { $NODEJAGNU=1; }
my $a_file_sizes="";
my $o_file_sizes="";
if(!$BuildError){
if ( $VERBOSE ){
print "Organizing size of .o and .a files\n";
}
ChangeDir( "$BuildDir/llvm", "Build Directory" );
$afiles = `find . -iname '*.a' -ls`;
$ofiles = `find . -iname '*.o' -ls`;
@AFILES = split "\n", $afiles;
$a_file_sizes="";
foreach $x (@AFILES){
$x =~ m/.+\s+.+\s+.+\s+.+\s+.+\s+.+\s+(.+)\s+.+\s+.+\s+.+\s+(.+)/;
$a_file_sizes.="$1 $2\n";
}
@OFILES = split "\n", $ofiles;
$o_file_sizes="";
foreach $x (@OFILES){
$x =~ m/.+\s+.+\s+.+\s+.+\s+.+\s+.+\s+(.+)\s+.+\s+.+\s+.+\s+(.+)/;
$o_file_sizes.="$1 $2\n";
}
}
else{
$a_file_sizes="No data due to a bad build.";
$o_file_sizes="No data due to a bad build.";
}
##############################################################
#
# Running dejagnu tests
@@ -748,7 +755,7 @@ my ($WarningsAdded, $WarningsRemoved) = DiffFiles "-Warnings.txt";
sub TestDirectory {
my $SubDir = shift;
ChangeDir( "projects/llvm-test/$SubDir", "Programs Test Subdirectory" );
ChangeDir( "projects/llvm-test/$SubDir", "Programs Test Subdirectory" ) || return ("", "");
my $ProgramTestLog = "$Prefix-$SubDir-ProgramTest.txt";
#my $ProgramTestLog = "$Prefix-MultiSource-ProgramTest.txt"; #CHANGE ME!