[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.74 - 1.75
---
Log message:
Fix problems with the checkout and cd directories for SVN checkout.
---
Diffs of the changes: (+4 -4)
NewNightlyTest.pl |8
1 files changed, 4 insertions(+), 4 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.74 llvm/utils/NewNightlyTest.pl:1.75
--- llvm/utils/NewNightlyTest.pl:1.74 Tue Jun 26 12:08:16 2007
+++ llvm/utils/NewNightlyTest.plThu Jun 28 22:12:42 2007
@@ -520,10 +520,10 @@
if ($USESVN) {
my $SVNCMD = $NICE svn co $SVNURL;
if ($VERBOSE) {
- print ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/trunk/projects ; .
-$SVNCMD/llvm-test/trunk llvm-test ) $COLog 21\n;
- system ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/trunk/projects ; .
-$SVNCMD/llvm-test/trunk llvm-test ) $COLog 21\n;
+ print ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; .
+$SVNCMD/test-suite/trunk llvm-test ) $COLog 21\n;
+ system ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; .
+$SVNCMD/test-suite/trunk llvm-test ) $COLog 21\n;
}
} else {
my $CVSOPT = ;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.73 - 1.74
---
Log message:
Update for Subversion conversion:
1. Fix comments for -usesvn and -svnurl options.
2. Fix default URL for SVN access.
3. Fix paths to accommodate trunk when checking out from SVN.
---
Diffs of the changes: (+7 -7)
NewNightlyTest.pl | 14 +++---
1 files changed, 7 insertions(+), 7 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.73 llvm/utils/NewNightlyTest.pl:1.74
--- llvm/utils/NewNightlyTest.pl:1.73 Mon May 14 13:03:45 2007
+++ llvm/utils/NewNightlyTest.plTue Jun 26 12:08:16 2007
@@ -45,10 +45,10 @@
# -gccpath Path to gcc/g++ used to build LLVM
# -cvstag Check out a specific CVS tag to build LLVM (useful for
# testing release branches)
-# -usesvn Check code out from a subversion repository. With no
-# argument, use the standard repository. An argument
specifies
-# the repository URL to use.
-# -svnurl Specify the SVN URL where LLVM can be found
+# -usesvn Check code out from a subversion repository.
+# -svnurl Specify the SVN URL where LLVM can be found. Needs -usesvn
+# to be useful. If -svnurl is not used but -usesvn is then
+# the standard (UIUC) repository will be used.
# -target Specify the target triplet
# -cflags Next argument specifies that C compilation options that
# override the default.
@@ -96,7 +96,7 @@
##
my $HOME = $ENV{'HOME'};
my $SVNURL = $ENV{SVNURL};
-$SVNURL= 'svn://[EMAIL PROTECTED]:3691/llvm.svn' unless $SVNURL;
+$SVNURL= 'https://llvm.org/svn/llvm-project' unless $SVNURL;
my $CVSRootDir = $ENV{'CVSROOT'};
$CVSRootDir= /home/vadve/shared/PublicCVS unless $CVSRootDir;
my $BuildDir = $ENV{'BUILDDIR'};
@@ -520,9 +520,9 @@
if ($USESVN) {
my $SVNCMD = $NICE svn co $SVNURL;
if ($VERBOSE) {
- print ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; .
+ print ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/trunk/projects ; .
$SVNCMD/llvm-test/trunk llvm-test ) $COLog 21\n;
- system ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; .
+ system ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/trunk/projects ; .
$SVNCMD/llvm-test/trunk llvm-test ) $COLog 21\n;
}
} else {
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.72 - 1.73
---
Log message:
Remove duplicated line.
---
Diffs of the changes: (+0 -1)
NewNightlyTest.pl |1 -
1 files changed, 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.72 llvm/utils/NewNightlyTest.pl:1.73
--- llvm/utils/NewNightlyTest.pl:1.72 Thu May 3 09:05:07 2007
+++ llvm/utils/NewNightlyTest.plMon May 14 13:03:45 2007
@@ -182,7 +182,6 @@
shift; next; }
if (/^-compileflags/){ $MAKEOPTS = $MAKEOPTS $ARGV[0]; shift; next; }
if (/^-use-gmake/) { $MAKECMD = gmake; shift; next; }
- if (/^-compileflags/){ $MAKEOPTS = $MAKEOPTS $ARGV[0]; shift; next; }
if (/^-extraflags/) { $CONFIGUREARGS .=
--with-extra-options=\'$ARGV[0]\'; shift;
next;}
if (/^-noexternals$/){ $NOEXTERNALS = 1; next; }
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils: NewNightlyTest.pl updated: 1.71 - 1.72 --- Log message: Make my proxy happy. --- Diffs of the changes: (+1 -0) NewNightlyTest.pl |1 + 1 files changed, 1 insertion(+) Index: llvm/utils/NewNightlyTest.pl diff -u llvm/utils/NewNightlyTest.pl:1.71 llvm/utils/NewNightlyTest.pl:1.72 --- llvm/utils/NewNightlyTest.pl:1.71 Thu Apr 12 23:36:48 2007 +++ llvm/utils/NewNightlyTest.plThu May 3 09:05:07 2007 @@ -454,6 +454,7 @@ $length = length($content); my $send= POST $file HTTP/1.0\n; +$send.= Host: $host\n; $send.= Content-Type: application/x-www-form-urlencoded\n; $send.= Content-length: $length\n\n; $send.= $content; ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.70 - 1.71
---
Log message:
Adding target triplet to be passed to database.
---
Diffs of the changes: (+18 -1)
NewNightlyTest.pl | 19 ++-
1 files changed, 18 insertions(+), 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.70 llvm/utils/NewNightlyTest.pl:1.71
--- llvm/utils/NewNightlyTest.pl:1.70 Tue Apr 10 14:13:43 2007
+++ llvm/utils/NewNightlyTest.plThu Apr 12 23:36:48 2007
@@ -193,7 +193,12 @@
if ($ENV{'LLVMGCCDIR'}) {
$CONFIGUREARGS .= --with-llvmgccdir= . $ENV{'LLVMGCCDIR'};
+ $LLVMGCCPATH = $ENV{'LLVMGCCDIR'};
}
+else {
+ $LLVMGCCPATH = ;
+}
+
if ($CONFIGUREARGS !~ /--disable-jit/) {
$CONFIGUREARGS .= --enable-jit;
}
@@ -1058,6 +1063,17 @@
@GCC_VERSION = split '\n', $gcc_version_long;
$gcc_version = $GCC_VERSION[0];
+$llvmgcc_version_long=;
+if ($LLVMGCCPATH ne ) {
+ $llvmgcc_version_long = `$LLVMGCCPATH/llvm-gcc -v 21`;
+} else {
+ $llvmgcc_version_long = `llvm-gcc -v 21`;
+}
[EMAIL PROTECTED] = split '\n', $llvmgcc_version_long;
+$llvmgcc_versionTarget = $LLVMGCC_VERSION[1];
+$llvmgcc_versionTarget =~ /Target: (.+)/;
+$targetTriple = $1;
+
if(!$BuildError){
@DEJAGNU_LOG = ReadFile $DejagnuLog;
@DEJAGNU_SUM = ReadFile $DejagnuSum;
@@ -1116,7 +1132,8 @@
'starttime' = $starttime,
'endtime' = $endtime,
'o_file_sizes' = $o_file_sizes,
- 'a_file_sizes' = $a_file_sizes
+ 'a_file_sizes' = $a_file_sizes,
+ 'target_triple' = $targetTriple
);
$TESTING = 0;
___
llvm-commits mailing list
[EMAIL PROTECTED]
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.69 - 1.70
---
Log message:
Correctly report version of GCC used.
---
Diffs of the changes: (+2 -0)
NewNightlyTest.pl |2 ++
1 files changed, 2 insertions(+)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.69 llvm/utils/NewNightlyTest.pl:1.70
--- llvm/utils/NewNightlyTest.pl:1.69 Sat Apr 7 00:20:07 2007
+++ llvm/utils/NewNightlyTest.plTue Apr 10 14:13:43 2007
@@ -1050,6 +1050,8 @@
$gcc_version_long=;
if ($GCCPATH ne ) {
$gcc_version_long = `$GCCPATH/gcc --version`;
+} elsif ($ENV{CC}) {
+ $gcc_version_long = `$ENV{CC} --version`;
} else {
$gcc_version_long = `gcc --version`;
}
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
Re: [llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
On Apr 6, 2007, at 9:41 PM, Reid Spencer wrote: Reinstate the SVN capability without requiring Date::Parse. As before the SVN Repository is only used if requested with -usesvn option otherwise it uses CVS. Woot! Thanks guys, -Chris ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.67 - 1.68
---
Log message:
Reinstate the SVN capability without requiring Date::Parse. As before the
SVN Repository is only used if requested with -usesvn option otherwise it
uses CVS.
---
Diffs of the changes: (+153 -62)
NewNightlyTest.pl | 215 ++
1 files changed, 153 insertions(+), 62 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.67 llvm/utils/NewNightlyTest.pl:1.68
--- llvm/utils/NewNightlyTest.pl:1.67 Wed Apr 4 01:59:36 2007
+++ llvm/utils/NewNightlyTest.plFri Apr 6 23:41:16 2007
@@ -45,6 +45,10 @@
# -gccpath Path to gcc/g++ used to build LLVM
# -cvstag Check out a specific CVS tag to build LLVM (useful for
# testing release branches)
+# -usesvn Check code out from a subversion repository. With no
+# argument, use the standard repository. An argument
specifies
+# the repository URL to use.
+# -svnurl Specify the SVN URL where LLVM can be found
# -target Specify the target triplet
# -cflags Next argument specifies that C compilation options that
# override the default.
@@ -91,6 +95,8 @@
#
##
my $HOME = $ENV{'HOME'};
+my $SVNURL = $ENV{SVNURL};
+$SVNURL= 'svn://[EMAIL PROTECTED]:3691/llvm.svn' unless $SVNURL;
my $CVSRootDir = $ENV{'CVSROOT'};
$CVSRootDir= /home/vadve/shared/PublicCVS unless $CVSRootDir;
my $BuildDir = $ENV{'BUILDDIR'};
@@ -116,6 +122,7 @@
$CONFIGUREARGS=;
$nickname=;
$NOTEST=0;
+$USESVN=0;
$NORUNNINGTESTS=0;
$MAKECMD=make;
$SUBMITSERVER = llvm.org;
@@ -163,6 +170,8 @@
else { $GCCPATH=; }
if (/^-cvstag/) { $CVSCOOPT .= -r $ARGV[0]; shift; next; }
else { $CVSCOOPT=;}
+ if (/^-usesvn/) { $USESVN = 1; }
+ if (/^-svnurl/) { $SVNURL = $ARGV[0]; shift; next; }
if (/^-target/) { $CONFIGUREARGS .= --target=$ARGV[0];
shift; next; }
if (/^-cflags/) { $MAKEOPTS = $MAKEOPTS C.Flags=\'$ARGV[0]\';
@@ -225,7 +234,7 @@
##
my $Prefix = $WebDir/$DATE;
my $BuildLog = $Prefix-Build-Log.txt;
-my $CVSLog = $Prefix-CVS-Log.txt;
+my $COLog = $Prefix-CVS-Log.txt;
my $OldenTestsLog = $Prefix-Olden-tests.txt;
my $SingleSourceLog = $Prefix-SingleSource-ProgramTest.txt.gz;
my $MultiSourceLog = $Prefix-MultiSource-ProgramTest.txt.gz;
@@ -242,11 +251,15 @@
if ($VERBOSE) {
print INITIALIZED\n;
- print CVS Root = $CVSRootDir\n;
+ if ($USESVN) {
+print SVN URL = $SVNURL\n;
+ } else {
+print CVS Root = $CVSRootDir\n;
+ }
+ print COLog= $COLog\n;
print BuildDir = $BuildDir\n;
print WebDir = $WebDir\n;
print Prefix = $Prefix\n;
- print CVSLog = $CVSLog\n;
print BuildLog = $BuildLog\n;
}
@@ -477,39 +490,48 @@
print Build directory exists! Removing it\n;
}
system rm -rf $BuildDir;
- mkdir $BuildDir or die Could not create CVS checkout directory
$BuildDir!;
+ mkdir $BuildDir or die Could not create checkout directory $BuildDir!;
} else {
if ( $VERBOSE ) {
print Build directory exists!\n;
}
}
} else {
-mkdir $BuildDir or die Could not create CVS checkout directory
$BuildDir!;
+mkdir $BuildDir or die Could not create checkout directory $BuildDir!;
}
}
-ChangeDir( $BuildDir, CVS checkout directory );
+ChangeDir( $BuildDir, checkout directory );
##
#
-# Check out the llvm tree, saving CVS messages to the cvs log...
+# Check out the llvm tree, using either SVN or CVS
#
##
-my $CVSOPT = ;
-# Use compression if going over ssh.
-$CVSOPT = -z3
- if $CVSRootDir =~ /^:ext:/;
-my $CVSCMD = $NICE cvs $CVSOPT -d $CVSRootDir co -P $CVSCOOPT;
if (!$NOCHECKOUT) {
if ( $VERBOSE ) {
print CHECKOUT STAGE:\n;
-print ( time -p $CVSCMD llvm; cd llvm/projects ; $CVSCMD llvm-test ) .
- $CVSLog 21\n;
}
- system ( time -p $CVSCMD llvm; cd llvm/projects ; .
- $CVSCMD llvm-test ) $CVSLog 21;
- ChangeDir( $BuildDir , CVS Checkout directory) ;
+ if ($USESVN) {
+my $SVNCMD = $NICE svn co $SVNURL;
+if ($VERBOSE) {
+ print ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; .
+$SVNCMD/llvm-test/trunk llvm-test ) $COLog 21\n;
+ system ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; .
+$SVNCMD/llvm-test/trunk llvm-test ) $COLog 21\n;
+}
+ } else {
+my $CVSOPT = ;
+$CVSOPT = -z3 # Use compression if going over ssh.
+ if $CVSRootDir =~ /^:ext:/;
+my $CVSCMD = $NICE cvs $CVSOPT -d
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.66 - 1.67
---
Log message:
Revert this until the Date::Parse module can be installed on the nightly
testers.
---
Diffs of the changes: (+62 -147)
NewNightlyTest.pl | 209 --
1 files changed, 62 insertions(+), 147 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.66 llvm/utils/NewNightlyTest.pl:1.67
--- llvm/utils/NewNightlyTest.pl:1.66 Tue Apr 3 03:28:44 2007
+++ llvm/utils/NewNightlyTest.plWed Apr 4 01:59:36 2007
@@ -1,7 +1,6 @@
#!/usr/bin/perl
use POSIX qw(strftime);
use File::Copy;
-use Date::Parse;
use Socket;
#
@@ -46,10 +45,6 @@
# -gccpath Path to gcc/g++ used to build LLVM
# -cvstag Check out a specific CVS tag to build LLVM (useful for
# testing release branches)
-# -usesvn Check code out from a subversion repository. With no
-# argument, use the standard repository. An argument
specifies
-# the repository URL to use.
-# -svnurl Specify the SVN URL where LLVM can be found
# -target Specify the target triplet
# -cflags Next argument specifies that C compilation options that
# override the default.
@@ -96,8 +91,6 @@
#
##
my $HOME = $ENV{'HOME'};
-my $SVNURL = $ENV{SVNURL};
-$SVNURL= 'svn://[EMAIL PROTECTED]:3691/llvm.svn' unless $SVNURL;
my $CVSRootDir = $ENV{'CVSROOT'};
$CVSRootDir= /home/vadve/shared/PublicCVS unless $CVSRootDir;
my $BuildDir = $ENV{'BUILDDIR'};
@@ -123,7 +116,6 @@
$CONFIGUREARGS=;
$nickname=;
$NOTEST=0;
-$USESVN=0;
$NORUNNINGTESTS=0;
$MAKECMD=make;
$SUBMITSERVER = llvm.org;
@@ -171,8 +163,6 @@
else { $GCCPATH=; }
if (/^-cvstag/) { $CVSCOOPT .= -r $ARGV[0]; shift; next; }
else { $CVSCOOPT=;}
- if (/^-usesvn/) { $USESVN = 1; }
- if (/^-svnurl/) { $SVNURL = $ARGV[0]; shift; next; }
if (/^-target/) { $CONFIGUREARGS .= --target=$ARGV[0];
shift; next; }
if (/^-cflags/) { $MAKEOPTS = $MAKEOPTS C.Flags=\'$ARGV[0]\';
@@ -235,7 +225,7 @@
##
my $Prefix = $WebDir/$DATE;
my $BuildLog = $Prefix-Build-Log.txt;
-my $COLog = $Prefix-CVS-Log.txt;
+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;
@@ -252,15 +242,11 @@
if ($VERBOSE) {
print INITIALIZED\n;
- if ($USESVN) {
-print SVN URL = $SVNURL\n;
- } else {
-print CVS Root = $CVSRootDir\n;
- }
- print COLog= $COLog\n;
+ print CVS Root = $CVSRootDir\n;
print BuildDir = $BuildDir\n;
print WebDir = $WebDir\n;
print Prefix = $Prefix\n;
+ print CVSLog = $CVSLog\n;
print BuildLog = $BuildLog\n;
}
@@ -491,48 +477,39 @@
print Build directory exists! Removing it\n;
}
system rm -rf $BuildDir;
- mkdir $BuildDir or die Could not create checkout directory $BuildDir!;
+ mkdir $BuildDir or die Could not create CVS checkout directory
$BuildDir!;
} else {
if ( $VERBOSE ) {
print Build directory exists!\n;
}
}
} else {
-mkdir $BuildDir or die Could not create checkout directory $BuildDir!;
+mkdir $BuildDir or die Could not create CVS checkout directory
$BuildDir!;
}
}
-ChangeDir( $BuildDir, checkout directory );
+ChangeDir( $BuildDir, CVS checkout directory );
##
#
-# Check out the llvm tree, using either SVN or CVS
+# Check out the llvm tree, saving CVS messages to the cvs log...
#
##
+my $CVSOPT = ;
+# Use compression if going over ssh.
+$CVSOPT = -z3
+ if $CVSRootDir =~ /^:ext:/;
+my $CVSCMD = $NICE cvs $CVSOPT -d $CVSRootDir co -P $CVSCOOPT;
if (!$NOCHECKOUT) {
if ( $VERBOSE ) {
print CHECKOUT STAGE:\n;
+print ( time -p $CVSCMD llvm; cd llvm/projects ; $CVSCMD llvm-test ) .
+ $CVSLog 21\n;
}
- if ($USESVN) {
-my $SVNCMD = $NICE svn co $SVNURL;
-if ($VERBOSE) {
- print ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; .
-$SVNCMD/llvm-test/trunk llvm-test ) $COLog 21\n;
- system ( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; .
-$SVNCMD/llvm-test/trunk llvm-test ) $COLog 21\n;
-}
- } else {
-my $CVSOPT = ;
-$CVSOPT = -z3 # Use compression if going over ssh.
- if $CVSRootDir =~ /^:ext:/;
-my $CVSCMD = $NICE cvs $CVSOPT -d $CVSRootDir co -P $CVSCOOPT;
-print ( time -p $CVSCMD llvm; cd llvm/projects ; .
- $CVSCMD llvm-test )
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.65 - 1.66
---
Log message:
Prepare for Subversion migration by implementing a -usesvn to tell the
script to to check out llvm and llvm-test from Subversion instead of CVS.
Without this option the script will continue to check out from CVS. To
specify the Subversion URL, set the SVNURL environment variable or pass
-svnurl followed by the URL. For now, -svnurl will default to Reid's
temporary (read-only, daily snapshot) SVN server. Try it out if you like!
---
Diffs of the changes: (+147 -62)
NewNightlyTest.pl | 209 +-
1 files changed, 147 insertions(+), 62 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.65 llvm/utils/NewNightlyTest.pl:1.66
--- llvm/utils/NewNightlyTest.pl:1.65 Fri Nov 24 14:34:16 2006
+++ llvm/utils/NewNightlyTest.plTue Apr 3 03:28:44 2007
@@ -1,6 +1,7 @@
#!/usr/bin/perl
use POSIX qw(strftime);
use File::Copy;
+use Date::Parse;
use Socket;
#
@@ -45,6 +46,10 @@
# -gccpath Path to gcc/g++ used to build LLVM
# -cvstag Check out a specific CVS tag to build LLVM (useful for
# testing release branches)
+# -usesvn Check code out from a subversion repository. With no
+# argument, use the standard repository. An argument
specifies
+# the repository URL to use.
+# -svnurl Specify the SVN URL where LLVM can be found
# -target Specify the target triplet
# -cflags Next argument specifies that C compilation options that
# override the default.
@@ -91,6 +96,8 @@
#
##
my $HOME = $ENV{'HOME'};
+my $SVNURL = $ENV{SVNURL};
+$SVNURL= 'svn://[EMAIL PROTECTED]:3691/llvm.svn' unless $SVNURL;
my $CVSRootDir = $ENV{'CVSROOT'};
$CVSRootDir= /home/vadve/shared/PublicCVS unless $CVSRootDir;
my $BuildDir = $ENV{'BUILDDIR'};
@@ -116,6 +123,7 @@
$CONFIGUREARGS=;
$nickname=;
$NOTEST=0;
+$USESVN=0;
$NORUNNINGTESTS=0;
$MAKECMD=make;
$SUBMITSERVER = llvm.org;
@@ -163,6 +171,8 @@
else { $GCCPATH=; }
if (/^-cvstag/) { $CVSCOOPT .= -r $ARGV[0]; shift; next; }
else { $CVSCOOPT=;}
+ if (/^-usesvn/) { $USESVN = 1; }
+ if (/^-svnurl/) { $SVNURL = $ARGV[0]; shift; next; }
if (/^-target/) { $CONFIGUREARGS .= --target=$ARGV[0];
shift; next; }
if (/^-cflags/) { $MAKEOPTS = $MAKEOPTS C.Flags=\'$ARGV[0]\';
@@ -225,7 +235,7 @@
##
my $Prefix = $WebDir/$DATE;
my $BuildLog = $Prefix-Build-Log.txt;
-my $CVSLog = $Prefix-CVS-Log.txt;
+my $COLog = $Prefix-CVS-Log.txt;
my $OldenTestsLog = $Prefix-Olden-tests.txt;
my $SingleSourceLog = $Prefix-SingleSource-ProgramTest.txt.gz;
my $MultiSourceLog = $Prefix-MultiSource-ProgramTest.txt.gz;
@@ -242,11 +252,15 @@
if ($VERBOSE) {
print INITIALIZED\n;
- print CVS Root = $CVSRootDir\n;
+ if ($USESVN) {
+print SVN URL = $SVNURL\n;
+ } else {
+print CVS Root = $CVSRootDir\n;
+ }
+ print COLog= $COLog\n;
print BuildDir = $BuildDir\n;
print WebDir = $WebDir\n;
print Prefix = $Prefix\n;
- print CVSLog = $CVSLog\n;
print BuildLog = $BuildLog\n;
}
@@ -477,39 +491,48 @@
print Build directory exists! Removing it\n;
}
system rm -rf $BuildDir;
- mkdir $BuildDir or die Could not create CVS checkout directory
$BuildDir!;
+ mkdir $BuildDir or die Could not create checkout directory $BuildDir!;
} else {
if ( $VERBOSE ) {
print Build directory exists!\n;
}
}
} else {
-mkdir $BuildDir or die Could not create CVS checkout directory
$BuildDir!;
+mkdir $BuildDir or die Could not create checkout directory $BuildDir!;
}
}
-ChangeDir( $BuildDir, CVS checkout directory );
+ChangeDir( $BuildDir, checkout directory );
##
#
-# Check out the llvm tree, saving CVS messages to the cvs log...
+# Check out the llvm tree, using either SVN or CVS
#
##
-my $CVSOPT = ;
-# Use compression if going over ssh.
-$CVSOPT = -z3
- if $CVSRootDir =~ /^:ext:/;
-my $CVSCMD = $NICE cvs $CVSOPT -d $CVSRootDir co -P $CVSCOOPT;
if (!$NOCHECKOUT) {
if ( $VERBOSE ) {
print CHECKOUT STAGE:\n;
-print ( time -p $CVSCMD llvm; cd llvm/projects ; $CVSCMD llvm-test ) .
- $CVSLog 21\n;
}
- system ( time -p $CVSCMD llvm; cd llvm/projects ; .
- $CVSCMD llvm-test ) $CVSLog 21;
- ChangeDir( $BuildDir , CVS Checkout directory) ;
+ if ($USESVN) {
+my $SVNCMD = $NICE svn co $SVNURL;
+if ($VERBOSE) {
+ print ( time -p $SVNCMD/llvm/trunk llvm; cd
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.63 - 1.64
---
Log message:
80 cols fix.
---
Diffs of the changes: (+2 -1)
NewNightlyTest.pl |3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.63 llvm/utils/NewNightlyTest.pl:1.64
--- llvm/utils/NewNightlyTest.pl:1.63 Fri Sep 29 12:31:45 2006
+++ llvm/utils/NewNightlyTest.plThu Oct 19 10:24:04 2006
@@ -136,7 +136,8 @@
OPTIMIZE_OPTION=-O2; $BUILDTYPE=release;
next;}
if (/^-release-asserts$/){ $MAKEOPTS = $MAKEOPTS ENABLE_OPTIMIZED=1 .
DISABLE-ASSERTIONS=1 .
- OPTIMIZE_OPTION=-O2;
$BUILDTYPE=release-asserts; next;}
+ OPTIMIZE_OPTION=-O2;
+ $BUILDTYPE=release-asserts; next;}
if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= ENABLE_LLCBETA=1; next; }
if (/^-disable-llc$/){ $PROGTESTOPTS .= DISABLE_LLC=1;
$CONFIGUREARGS .= --disable-llc_diffs; next; }
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.62 - 1.63
---
Log message:
Wrong directory.
---
Diffs of the changes: (+2 -2)
NewNightlyTest.pl |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.62 llvm/utils/NewNightlyTest.pl:1.63
--- llvm/utils/NewNightlyTest.pl:1.62 Thu Sep 28 13:45:11 2006
+++ llvm/utils/NewNightlyTest.plFri Sep 29 12:31:45 2006
@@ -660,7 +660,7 @@
$afiles.= `find lib/ -iname '*.a' -ls`;
$afiles.= `find tools/ -iname '*.a' -ls`;
if($BUILDTYPE eq release){
-$afiles.= `find Release+Asserts/ -iname '*.a' -ls`;
+$afiles.= `find Release/ -iname '*.a' -ls`;
} elsif($BUILDTYPE eq release-asserts) {
$afiles.= `find Release-Asserts/ -iname '*.a' -ls`;
} else {
@@ -671,7 +671,7 @@
$ofiles.= `find lib/ -iname '*.o' -ls`;
$ofiles.= `find tools/ -iname '*.o' -ls`;
if($BUILDTYPE eq release){
-$ofiles.= `find Release+Asserts/ -iname '*.o' -ls`;
+$ofiles.= `find Release/ -iname '*.o' -ls`;
} elsif($BUILDTYPE eq release-asserts) {
$ofiles.= `find Release-Asserts/ -iname '*.o' -ls`;
} else {
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.60 - 1.61
---
Log message:
Add support for -release-asserts.
---
Diffs of the changes: (+9 -1)
NewNightlyTest.pl | 10 +-
1 files changed, 9 insertions(+), 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.60 llvm/utils/NewNightlyTest.pl:1.61
--- llvm/utils/NewNightlyTest.pl:1.60 Wed Sep 20 04:20:22 2006
+++ llvm/utils/NewNightlyTest.plThu Sep 28 12:49:20 2006
@@ -29,6 +29,7 @@
# -nodejagnu Do not run feature or regression tests
# -parallelRun two parallel jobs with GNU Make.
# -release Build an LLVM Release version
+# -release-asserts Build an LLVM ReleaseAsserts version
# -enable-llcbeta Enable testing of beta features in llc.
# -disable-llc Disable LLC tests in the nightly tester.
# -disable-jit Disable JIT tests in the nightly tester.
@@ -133,6 +134,9 @@
if (/^-parallel$/) { $MAKEOPTS = $MAKEOPTS -j2 -l3.0; next; }
if (/^-release$/){ $MAKEOPTS = $MAKEOPTS ENABLE_OPTIMIZED=1 .
OPTIMIZE_OPTION=-O2; $BUILDTYPE=release;
next;}
+ if (/^-release-asserts$/){ $MAKEOPTS = $MAKEOPTS ENABLE_OPTIMIZED=1 .
+ DISABLE-ASSERTIONS=1 .
+ OPTIMIZE_OPTION=-O2;
$BUILDTYPE=release-asserts; next;}
if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= ENABLE_LLCBETA=1; next; }
if (/^-disable-llc$/){ $PROGTESTOPTS .= DISABLE_LLC=1;
$CONFIGUREARGS .= --disable-llc_diffs; next; }
@@ -206,7 +210,7 @@
\-nickname nickname\);
}
-if ($BUILDTYPE ne release) {
+if ($BUILDTYPE ne release $BUILDTYPE ne release-asserts) {
$BUILDTYPE = debug;
}
@@ -657,6 +661,8 @@
$afiles.= `find tools/ -iname '*.a' -ls`;
if($BUILDTYPE eq release){
$afiles.= `find Release/ -iname '*.a' -ls`;
+ } elsif($BUILDTYPE eq release-asserts) {
+ $afiles.= `find Release-Asserts/ -iname '*.a' -ls`;
} else {
$afiles.= `find Debug/ -iname '*.a' -ls`;
}
@@ -666,6 +672,8 @@
$ofiles.= `find tools/ -iname '*.o' -ls`;
if($BUILDTYPE eq release){
$ofiles.= `find Release/ -iname '*.o' -ls`;
+ } elsif($BUILDTYPE eq release-asserts) {
+$ofiles.= `find Release-Asserts/ -iname '*.o' -ls`;
} else {
$ofiles.= `find Debug/ -iname '*.o' -ls`;
}
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.61 - 1.62
---
Log message:
Fix search file for -release.
---
Diffs of the changes: (+2 -2)
NewNightlyTest.pl |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.61 llvm/utils/NewNightlyTest.pl:1.62
--- llvm/utils/NewNightlyTest.pl:1.61 Thu Sep 28 12:49:20 2006
+++ llvm/utils/NewNightlyTest.plThu Sep 28 13:45:11 2006
@@ -660,7 +660,7 @@
$afiles.= `find lib/ -iname '*.a' -ls`;
$afiles.= `find tools/ -iname '*.a' -ls`;
if($BUILDTYPE eq release){
-$afiles.= `find Release/ -iname '*.a' -ls`;
+$afiles.= `find Release+Asserts/ -iname '*.a' -ls`;
} elsif($BUILDTYPE eq release-asserts) {
$afiles.= `find Release-Asserts/ -iname '*.a' -ls`;
} else {
@@ -671,7 +671,7 @@
$ofiles.= `find lib/ -iname '*.o' -ls`;
$ofiles.= `find tools/ -iname '*.o' -ls`;
if($BUILDTYPE eq release){
-$ofiles.= `find Release/ -iname '*.o' -ls`;
+$ofiles.= `find Release+Asserts/ -iname '*.o' -ls`;
} elsif($BUILDTYPE eq release-asserts) {
$ofiles.= `find Release-Asserts/ -iname '*.o' -ls`;
} else {
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.59 - 1.60
---
Log message:
Trim the home directory from the dejagnu test
---
Diffs of the changes: (+2 -3)
NewNightlyTest.pl |5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.59 llvm/utils/NewNightlyTest.pl:1.60
--- llvm/utils/NewNightlyTest.pl:1.59 Fri Sep 15 12:03:36 2006
+++ llvm/utils/NewNightlyTest.plWed Sep 20 04:20:22 2006
@@ -385,9 +385,8 @@
while ( SRCHFILE ) {
if ( length($_) 1 ) {
chomp($_);
-if ( m/^PASS:/ || m/^XPASS:/ ||
- m/^FAIL:/ || m/^XFAIL:/) {
-push(@lines, $_);
+if ( m/^(PASS|XPASS|FAIL|XFAIL): .*\/llvm\/test\/(.*)$/ ) {
+push(@lines, $1: test/$2);
}
}
}
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.58 - 1.59
---
Log message:
Switching to NewNightlyTest.php
---
Diffs of the changes: (+8 -4)
NewNightlyTest.pl | 12
1 files changed, 8 insertions(+), 4 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.58 llvm/utils/NewNightlyTest.pl:1.59
--- llvm/utils/NewNightlyTest.pl:1.58 Tue Aug 29 13:01:18 2006
+++ llvm/utils/NewNightlyTest.plFri Sep 15 12:03:36 2006
@@ -67,7 +67,7 @@
# webserver
# -submit-script Specifies which script to call on the submit server. If
# this option is not specified it defaults to
-# /nightlytest/NightlyTestAccept.cgi. This is basically
+# /nightlytest/NightlyTestAccept.php. This is basically
# everything after the www.yourserver.org.
#
# CVSROOT is the CVS repository from which the tree will be checked out,
@@ -117,7 +117,7 @@
$NORUNNINGTESTS=0;
$MAKECMD=make;
$SUBMITSERVER = llvm.org;
-$SUBMITSCRIPT = /nightlytest/NightlyTestAccept.cgi;
+$SUBMITSCRIPT = /nightlytest/NightlyTestAccept.php;
while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
shift;
@@ -470,11 +470,15 @@
print Build directory exists! Removing it\n;
}
system rm -rf $BuildDir;
+ mkdir $BuildDir or die Could not create CVS checkout directory
$BuildDir!;
} else {
- die CVS checkout directory $BuildDir already exists!;
+ if ( $VERBOSE ) {
+print Build directory exists!\n;
+ }
}
+ } else {
+mkdir $BuildDir or die Could not create CVS checkout directory
$BuildDir!;
}
- mkdir $BuildDir or die Could not create CVS checkout directory $BuildDir!;
}
ChangeDir( $BuildDir, CVS checkout directory );
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.55 - 1.56
---
Log message:
The new nightly tester should stop outputing a message stating the
testresults directory is not present unless the script is run as verbose.
---
Diffs of the changes: (+24 -22)
NewNightlyTest.pl | 46 --
1 files changed, 24 insertions(+), 22 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.55 llvm/utils/NewNightlyTest.pl:1.56
--- llvm/utils/NewNightlyTest.pl:1.55 Fri Aug 18 13:00:21 2006
+++ llvm/utils/NewNightlyTest.plMon Aug 21 15:45:57 2006
@@ -227,7 +227,9 @@
my $DejagnuTestsLog = $Prefix-DejagnuTests-Log.txt;
if (! -d $WebDir) {
mkdir $WebDir, 0777;
- warn $WebDir did not exist; creating it.\n;
+ if($VERBOSE){
+warn $WebDir did not exist; creating it.\n;
+ }
}
if ($VERBOSE) {
@@ -941,28 +943,28 @@
@BUILD_DATA = ReadFile $BuildLog;
$build_data = join(\n, @BUILD_DATA);
-my @DEJAGNU_LOG;
-my @DEJAGNU_SUM;
-my $dejagnutests_log;
-my $dejagnutests_sum;
[EMAIL PROTECTED] = ReadFile $DejagnuLog;
[EMAIL PROTECTED] = ReadFile $DejagnuSum;
-$dejagnutests_log = join(\n, @DEJAGNU_LOG);
-$dejagnutests_sum = join(\n, @DEJAGNU_SUM);
-
-my @DEJAGNULOG_FULL;
-my $dejagnulog_full;
[EMAIL PROTECTED] = ReadFile $DejagnuTestsLog;
-$dejagnulog_full = join(\n, @DEJAGNULOG_FULL);
-
-my $gcc_version_long=;
-if ($GCCPATH ne ) {
- $gcc_version_long = `$GCCPATH/gcc --version`;
-} else {
- $gcc_version_long = `gcc --version`;
+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`;
+ } else {
+ $gcc_version_long = `gcc --version`;
+ }
+ @GCC_VERSION = split '\n', $gcc_version_long;
+ $gcc_version = $GCC_VERSION[0];
}
[EMAIL PROTECTED] = split '\n', $gcc_version_long;
-my $gcc_version = $GCC_VERSION[0];
##
#
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.54 - 1.55
---
Log message:
These changes reflect the changes in the database for how tests are stored
and bring the handing of dejagnu tests into compliance with this new scheme.
---
Diffs of the changes: (+26 -51)
NewNightlyTest.pl | 77 ++
1 files changed, 26 insertions(+), 51 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.54 llvm/utils/NewNightlyTest.pl:1.55
--- llvm/utils/NewNightlyTest.pl:1.54 Thu Aug 17 17:11:03 2006
+++ llvm/utils/NewNightlyTest.plFri Aug 18 13:00:21 2006
@@ -365,64 +365,39 @@
}
#~
+#
+# This function is meant to read in the dejagnu sum file and
+# return a string with only the results (i.e. PASS/FAIL/XPASS/
+# XFAIL).
+#
#~
sub GetDejagnuTestResults { # (filename, log)
- my ($filename, $DejagnuLog) = @_;
- my @lines;
- my $firstline;
- $/ = \n; #Make sure we're going line at a time.
-
- if( $VERBOSE) { print DEJAGNU TEST RESULTS:\n; }
-
- if (open SRCHFILE, $filename) {
-# Process test results
-my $first_list = 1;
-my $should_break = 1;
-my $nocopy = 0;
-my $readingsum = 0;
-while ( SRCHFILE ) {
-if ( length($_) 1 ) {
-chomp($_);
-if ( m/^XPASS:/ || m/^FAIL:/ ) {
-$nocopy = 0;
-if ( $first_list ) {
-push(@lines, UNEXPECTED TEST RESULTS\n);
-$first_list = 0;
-$should_break = 1;
-push(@lines, $_\n);
-if( $VERBOSE) { print $_\n; }
-} else {
-push(@lines, $_\n);
-if( $VERBOSE) { print $_\n; }
+my ($filename, $DejagnuLog) = @_;
+my @lines;
+$/ = \n; #Make sure we're going line at a time.
+
+if( $VERBOSE) { print DEJAGNU TEST RESULTS:\n; }
+
+if (open SRCHFILE, $filename) {
+# Process test results
+while ( SRCHFILE ) {
+if ( length($_) 1 ) {
+chomp($_);
+if ( m/^PASS:/ || m/^XPASS:/ ||
+ m/^FAIL:/ || m/^XFAIL:/) {
+push(@lines, $_);
}
-} #elsif ( m/Summary/ ) {
-#if ( $first_list ) {
-# push(@lines, PERFECT!);
-# print PERFECT!\n;
-#} else {
-# push(@lines, /li/ol\n);
-#}
-#push(@lines, STATISTICS\n);
-#print \nDEJAGNU STATISTICS:\n;
-#$should_break = 0;
-#$nocopy = 0;
-#$readingsum = 1;
-#}
-elsif ( $readingsum ) {
-push(@lines,$_\n);
-if( $VERBOSE) { print $_\n; }
}
-
}
}
- }
- close SRCHFILE;
+close SRCHFILE;
- my $content = join(, @lines);
- return $content;
+my $content = join(\n, @lines);
+return $content;
}
+
#~
#
# This function acts as a mini web browswer submitting data
@@ -716,7 +691,7 @@
# Running dejagnu tests
#
##
-my $DejangnuTestResults; # String containing the results of the dejagnu
+my $DejangnuTestResults=; # String containing the results of the dejagnu
my $dejagnu_output = $DejagnuTestsLog;
if (!$NODEJAGNU) {
if($VERBOSE) {
@@ -1032,8 +1007,8 @@
'all_tests' = $dejagnu_test_list,
'new_tests' = ,
'removed_tests' = ,
- 'dejagnutests_log' = $dejagnutests_log,
- 'dejagnutests_sum' = $dejagnutests_sum,
+ 'dejagnutests_results' = $DejagnuTestResults,
+ 'dejagnutests_log' = $dejagnulog_full,
'starttime' = $starttime,
'endtime' = $endtime,
'o_file_sizes' = $o_file_sizes,
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.53 - 1.54
---
Log message:
Changing the format dejagnu tests are submitted. We used to only submit
multisource information for pass fail. Now we submit all pass/fail test
information. This should fix the issue where some results were not being
reported.
---
Diffs of the changes: (+23 -19)
NewNightlyTest.pl | 42 +++---
1 files changed, 23 insertions(+), 19 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.53 llvm/utils/NewNightlyTest.pl:1.54
--- llvm/utils/NewNightlyTest.pl:1.53 Wed Aug 16 17:32:20 2006
+++ llvm/utils/NewNightlyTest.plThu Aug 17 17:11:03 2006
@@ -824,7 +824,7 @@
# Create a list of the tests which were run...
#
system egrep 'TEST-(PASS|FAIL)' $ProgramTestLog .
- | sort $Prefix-multisourceprogramstable.txt;
+ | sort $Prefix-$SubDir-Tests.txt;
}
$ProgramsTable = ReadFile report.nightly.csv;
@@ -832,37 +832,47 @@
return ($ProgramsTable, $llcbeta_options);
} #end sub TestDirectory
+##
+#
+# Calling sub TestDirectory
+#
+##
if (!$BuildError) {
if ( $VERBOSE ) {
print SingleSource TEST STAGE\n;
}
($SingleSourceProgramsTable, $llcbeta_options) =
TestDirectory(SingleSource);
- WriteFile $Prefix-singlesourceprogramstable.txt,
$SingleSourceProgramsTable;
+ WriteFile $Prefix-SingleSource-Performance.txt, $SingleSourceProgramsTable;
if ( $VERBOSE ) {
- print MultiSource TEST STAGE\n;
+print MultiSource TEST STAGE\n;
}
($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory(MultiSource);
- WriteFile $Prefix-multisourceprogramstable.txt, $MultiSourceProgramsTable;
+ WriteFile $Prefix-MultiSource-Performance.txt, $MultiSourceProgramsTable;
if ( ! $NOEXTERNALS ) {
if ( $VERBOSE ) {
print External TEST STAGE\n;
}
($ExternalProgramsTable, $llcbeta_options) = TestDirectory(External);
-WriteFile $Prefix-externalprogramstable.txt, $ExternalProgramsTable;
-system cat $Prefix-singlesourceprogramstable.txt .
- $Prefix-multisourceprogramstable.txt .
- $Prefix-externalprogramstable.txt | sort $Prefix-Tests.txt;
+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;
} else {
$ExternalProgramsTable = External TEST STAGE SKIPPED\n;
if ( $VERBOSE ) {
print External TEST STAGE SKIPPED\n;
}
-system cat $Prefix-singlesourceprogramstable.txt .
- $Prefix-multisourceprogramstable.txt .
+system cat $Prefix-SingleSource-Tests.txt .
+ $Prefix-MultiSource-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 +882,8 @@
#
#
##
-my $dejagnu = ReadFile $DejagnuSum;
-my @DEJAGNU = split \n, $dejagnu;
-my $dejagnu_test_list=;
+my $dejagnu_test_list = ReadFile $Prefix-Tests.txt;
+my @DEJAGNU = split \n, $dejagnu_test_list;
my $passes=,
my $fails=;
@@ -884,15 +893,12 @@
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;
}
}
}
@@ -983,8 +989,6 @@
@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
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.51 - 1.52
---
Log message:
Changed the call to countloc.sh so that the correct topdirectory of the llvm
build is set.
---
Diffs of the changes: (+19 -20)
NewNightlyTest.pl | 39 +++
1 files changed, 19 insertions(+), 20 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.51 llvm/utils/NewNightlyTest.pl:1.52
--- llvm/utils/NewNightlyTest.pl:1.51 Mon Aug 14 13:49:05 2006
+++ llvm/utils/NewNightlyTest.plWed Aug 16 17:18:41 2006
@@ -117,7 +117,7 @@
$NORUNNINGTESTS=0;
$MAKECMD=make;
$SUBMITSERVER = llvm.org;
-$SUBMITSCRIPT = /nightlytest/NightlyTestAccept.cgi;
+$SUBMITSCRIPT = /nightlytest/NightlyTestAccept2.cgi;
while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
shift;
@@ -638,7 +638,7 @@
# 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.
-my $LOC = `utils/countloc.sh -topdir $BuildDir`;
+my $LOC = `utils/countloc.sh -topdir $BuildDir/llvm`;
# Get the time taken by the configure script
my $ConfigTimeU = GetRegexNum ^user, 0, ([0-9.]+), $BuildLog;
@@ -824,7 +824,7 @@
# Create a list of the tests which were run...
#
system egrep 'TEST-(PASS|FAIL)' $ProgramTestLog .
- | sort $Prefix-multisourceprogramstable.txt;
+ | sort $Prefix-$SubDir-Tests.txt;
}
$ProgramsTable = ReadFile report.nightly.csv;
@@ -838,31 +838,36 @@
}
($SingleSourceProgramsTable, $llcbeta_options) =
TestDirectory(SingleSource);
- WriteFile $Prefix-singlesourceprogramstable.txt,
$SingleSourceProgramsTable;
+ WriteFile $Prefix-SingleSource-Performance.txt, $SingleSourceProgramsTable;
if ( $VERBOSE ) {
print MultiSource TEST STAGE\n;
}
($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory(MultiSource);
- WriteFile $Prefix-multisourceprogramstable.txt, $MultiSourceProgramsTable;
+ WriteFile $Prefix-MultiSource-Performance.txt, $MultiSourceProgramsTable;
if ( ! $NOEXTERNALS ) {
if ( $VERBOSE ) {
print External TEST STAGE\n;
}
($ExternalProgramsTable, $llcbeta_options) = TestDirectory(External);
-WriteFile $Prefix-externalprogramstable.txt, $ExternalProgramsTable;
-system cat $Prefix-singlesourceprogramstable.txt .
- $Prefix-multisourceprogramstable.txt .
- $Prefix-externalprogramstable.txt | sort $Prefix-Tests.txt;
+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;
} else {
$ExternalProgramsTable = External TEST STAGE SKIPPED\n;
if ( $VERBOSE ) {
print External TEST STAGE SKIPPED\n;
}
-system cat $Prefix-singlesourceprogramstable.txt .
- $Prefix-multisourceprogramstable.txt .
+system cat $Prefix-SingleSource-Tests.txt .
+ $Prefix-MultiSource-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 @@
#
#
##
-my $dejagnu = ReadFile $DejagnuSum;
-my @DEJAGNU = split \n, $dejagnu;
-my $dejagnu_test_list=;
+my $dejagnu_test_list = ReadFile $Prefix-Tests.txt;
+my @DEJAGNU = split \n, $dejagnu_test_list;
my $passes=,
my $fails=;
@@ -884,15 +888,12 @@
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;
}
}
}
@@ -983,8 +984,6 @@
@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
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
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.plWed 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
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.49 - 1.50
---
Log message:
Added some comments to clarify code around sub TestDirectory
---
Diffs of the changes: (+1 -2)
NewNightlyTest.pl |3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.49 llvm/utils/NewNightlyTest.pl:1.50
--- llvm/utils/NewNightlyTest.pl:1.49 Sun Aug 13 04:53:02 2006
+++ llvm/utils/NewNightlyTest.plMon Aug 14 11:07:14 2006
@@ -636,7 +636,6 @@
#my $NumLibraries = scalar(grep(!/executable/, @Linked));
#my $NumObjects = `grep ']\: Compiling ' $BuildLog | wc -l` + 0;
-
# 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.
my $LOC = `utils/countloc.sh`;
@@ -831,7 +830,7 @@
ChangeDir( ../../.., Programs Test Parent Directory );
return ($ProgramsTable, $llcbeta_options);
-}
+} #end sub TestDirectory
if (!$BuildError) {
if ( $VERBOSE ) {
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl countloc.sh getsrcs.sh llvmdo llvmgrep userloc.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.50 - 1.51
countloc.sh updated: 1.6 - 1.7
getsrcs.sh updated: 1.21 - 1.22
llvmdo updated: 1.18 - 1.19
llvmgrep updated: 1.10 - 1.11
userloc.pl updated: 1.8 - 1.9
---
Log message:
Make all tools that use llvmdo have a -topdir option that allows the top
source dir for LLVM to be specified explicitly. This removes the dependency
on the llvm-config script. If the option is not given, then the scripts use
llvm-config which should be both built and in the PATH. This arrangement
provides a useful default for most developers but also allows the nightly
tester to execute countloc.sh before llvm-config is built and without
altering the PATH.
---
Diffs of the changes: (+186 -127)
NewNightlyTest.pl |2
countloc.sh | 19 +++-
getsrcs.sh| 18 +++
llvmdo| 244 --
llvmgrep | 15 ++-
userloc.pl| 15 ++-
6 files changed, 186 insertions(+), 127 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.50 llvm/utils/NewNightlyTest.pl:1.51
--- llvm/utils/NewNightlyTest.pl:1.50 Mon Aug 14 11:07:14 2006
+++ llvm/utils/NewNightlyTest.plMon Aug 14 13:49:05 2006
@@ -638,7 +638,7 @@
# 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.
-my $LOC = `utils/countloc.sh`;
+my $LOC = `utils/countloc.sh -topdir $BuildDir`;
# Get the time taken by the configure script
my $ConfigTimeU = GetRegexNum ^user, 0, ([0-9.]+), $BuildLog;
Index: llvm/utils/countloc.sh
diff -u llvm/utils/countloc.sh:1.6 llvm/utils/countloc.sh:1.7
--- llvm/utils/countloc.sh:1.6 Sun Aug 13 13:29:21 2006
+++ llvm/utils/countloc.sh Mon Aug 14 13:49:05 2006
@@ -12,20 +12,29 @@
# (excluding certain things), runs wc -l on them to get the number of lines
in
# each file and then sums up and prints the total with awk.
#
-# The script takes no arguments but does expect to be run from somewhere in
-# the top llvm source directory.
+# The script takes one optional option, -topdir, which specifies the top llvm
+# source directory. If it is not specified then the llvm-config tool is
+# consulted to find top source dir.
#
# Note that the implementation is based on llvmdo. See that script for more
# details.
##===--===##
-TOPDIR=`llvm-config --src-root`
+if test $# -gt 1 ; then
+ if test $1 = -topdir ; then
+TOPDIR=$2
+shift; shift;
+ else
+TOPDIR=`llvm-config --src-root`
+ fi
+fi
+
if test -d $TOPDIR ; then
cd $TOPDIR
- ./utils/llvmdo -dirs include lib tools test utils examples -code-only wc
-l | awk '\
+ ./utils/llvmdo -topdir $TOPDIR -dirs include lib tools test utils
examples -code-only wc -l | awk '\
BEGIN { loc=0; } \
{ loc += $1; } \
END { print loc; }'
else
- echo Can't find LLVM top directory in $TOPDIR
+ echo Can't find LLVM top directory
fi
Index: llvm/utils/getsrcs.sh
diff -u llvm/utils/getsrcs.sh:1.21 llvm/utils/getsrcs.sh:1.22
--- llvm/utils/getsrcs.sh:1.21 Mon Sep 20 03:09:36 2004
+++ llvm/utils/getsrcs.sh Mon Aug 14 13:49:05 2006
@@ -10,15 +10,27 @@
##===--===##
#
# This script just prints out the path names for all the source files in LLVM.
+# The optional -topdir option can be used to specify the top LLVM source
+# directory. Without it, the llvm-config command is consulted to find the
+# top source directory.
#
# Note that the implementation is based on llvmdo. See that script for more
# details.
##===--===##
-TOPDIR=`pwd | sed -e 's#\(.*/llvm\).*#\1#'`
+if test $# -gt 1 ; then
+ if test $1 = -topdir ; then
+TOPDIR=$2
+shift; shift;
+ else
+TOPDIR=`llvm-config --src-root`
+ fi
+fi
+
if test -d $TOPDIR ; then
cd $TOPDIR
- ./utils/llvmdo -dirs include lib tools utils examples projects echo
+ ./utils/llvmdo -topdir $TOPDIR \
+-dirs include lib tools utils examples projects echo
else
- echo Can't find LLVM top directory in $TOPDIR
+ echo Can't find LLVM top directory
fi
Index: llvm/utils/llvmdo
diff -u llvm/utils/llvmdo:1.18 llvm/utils/llvmdo:1.19
--- llvm/utils/llvmdo:1.18 Sun Aug 13 13:59:40 2006
+++ llvm/utils/llvmdo Mon Aug 14 13:49:05 2006
@@ -11,28 +11,46 @@
# This script is a general purpose apply function for the source files in
LLVM
# It uses find to locate all the source files and then applies the user's
# command to them. As such, this command is often not used by itself much but
-# the other find related tools (countloc.sh,llvmgrep,getsrcs.sh) are all based
-# on the implementation. This script defines what is a source file in LLVM
and
-# so should be maintained if new directories, new file extensions,
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.48 - 1.49
---
Log message:
Changes for LLVM coding standard compliance:
1. Remove tabs
2. Wrap to 80 columns
3. Put spaces between if or elsif and expression
4. Put { on same line as if statement.
5. Make indentation be 2 spaces.
Functionality change:
Run utils/countloc.sh after the build is done. This is necessary because
that script now uses llvm-config to find the top src directory.
---
Diffs of the changes: (+491 -508)
NewNightlyTest.pl | 999 ++
1 files changed, 491 insertions(+), 508 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.48 llvm/utils/NewNightlyTest.pl:1.49
--- llvm/utils/NewNightlyTest.pl:1.48 Fri Aug 11 18:02:09 2006
+++ llvm/utils/NewNightlyTest.plSun Aug 13 04:53:02 2006
@@ -9,7 +9,7 @@
# Synopsis: Perform a series of tests which are designed to be run nightly.
# This is used to keep track of the status of the LLVM tree, tracking
# regressions and performance changes. Submits this information
-# to llvm.org where it is placed into the nightlytestresults
database.
+# to llvm.org where it is placed into the nightlytestresults
database.
#
# Modified heavily by Patrick Jenkins, July 2006
#
@@ -88,16 +88,13 @@
# Getting environment variables
#
##
-my $HOME = $ENV{'HOME'};
+my $HOME = $ENV{'HOME'};
my $CVSRootDir = $ENV{'CVSROOT'};
- $CVSRootDir = /home/vadve/shared/PublicCVS
-unless $CVSRootDir;
+$CVSRootDir= /home/vadve/shared/PublicCVS unless $CVSRootDir;
my $BuildDir = $ENV{'BUILDDIR'};
- $BuildDir = $HOME/buildtest
-unless $BuildDir;
+$BuildDir = $HOME/buildtest unless $BuildDir;
my $WebDir = $ENV{'WEBDIR'};
- $WebDir = $HOME/cvs/testresults-X86
-unless $WebDir;
+$WebDir= $HOME/cvs/testresults-X86 unless $WebDir;
##
#
@@ -123,114 +120,94 @@
$SUBMITSCRIPT = /nightlytest/NightlyTestAccept.cgi;
while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
-shift;
-last if /^--$/; # Stop processing arguments on --
+ shift;
+ last if /^--$/; # Stop processing arguments on --
# List command line options here...
-if (/^-nocheckout$/) { $NOCHECKOUT = 1; next; }
-if (/^-nocvsstats$/) { $NOCVSSTATS = 1; next; }
-if (/^-noremove$/) { $NOREMOVE = 1; next; }
-if (/^-noremoveresults$/) { $NOREMOVERESULTS = 1; next; }
-if (/^-notest$/) { $NOTEST = 1; $NORUNNINGTESTS = 1; next; }
-if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
-if (/^-parallel$/) { $MAKEOPTS = $MAKEOPTS -j2 -l3.0; next; }
-if (/^-release$/){ $MAKEOPTS = $MAKEOPTS ENABLE_OPTIMIZED=1 .
-
OPTIMIZE_OPTION=-O2;
-
$BUILDTYPE=release; next; }
-if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= ENABLE_LLCBETA=1; next; }
-if (/^-disable-llc$/){ $PROGTESTOPTS .= DISABLE_LLC=1;
- $CONFIGUREARGS .= --disable-llc_diffs; next;
}
-if (/^-disable-jit$/){ $PROGTESTOPTS .= DISABLE_JIT=1;
- $CONFIGUREARGS .= --disable-jit; next; }
-if (/^-disable-cbe$/){ $PROGTESTOPTS .= DISABLE_CBE=1; next; }
-if (/^-verbose$/){ $VERBOSE = 1; next; }
-if (/^-debug$/) { $DEBUG = 1; next; }
-if (/^-nice$/) { $NICE = nice ; next; }
-if (/^-f2c$/){
- $CONFIGUREARGS .= --with-f2c=$ARGV[0]; shift; next;
-}
-if (/^-with-externals$/) {
- $CONFIGUREARGS .= --with-externals=$ARGV[0]; shift; next;
-}
-if (/^-submit-server/) {
- $SUBMITSERVER = $ARGV[0]; shift; next;
-}
-if (/^-submit-script/) {
- $SUBMITSCRIPT = $ARGV[0]; shift; next;
-}
-if (/^-nickname$/) { $nickname = $ARGV[0]; shift; next; }
-if (/^-gccpath/) { $CONFIGUREARGS .=
-
CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++;
- $GCCPATH=$ARGV[0];
- shift;
- next;}
-else{ $GCCPATH=; }
-if (/^-cvstag/) { $CVSCOOPT .= -r $ARGV[0]; shift; next; }
-else{ $CVSCOOPT=;}
-if (/^-target/) {
- $CONFIGUREARGS .= --target=$ARGV[0]; shift; next;
-}
-if (/^-cflags/) {
- $MAKEOPTS = $MAKEOPTS C.Flags=\'$ARGV[0]\'; shift; next;
-}
-if (/^-cxxflags/){
- $MAKEOPTS = $MAKEOPTS CXX.Flags=\'$ARGV[0]\'; shift; next;
-}
-if (/^-ldflags/) {
- $MAKEOPTS = $MAKEOPTS
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.47 - 1.48
---
Log message:
Added two flags (-submit-server and -submit-script) which allow the user to
specify where the test results are submitted too. If these are not specified
they default to the LLVM.org server.
---
Diffs of the changes: (+18 -5)
NewNightlyTest.pl | 23 ++-
1 files changed, 18 insertions(+), 5 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.47 llvm/utils/NewNightlyTest.pl:1.48
--- llvm/utils/NewNightlyTest.pl:1.47 Wed Aug 9 00:45:12 2006
+++ llvm/utils/NewNightlyTest.plFri Aug 11 18:02:09 2006
@@ -52,7 +52,7 @@
# the default.
# -compileflagsNext argument specifies extra options passed to make when
# building LLVM.
-# -use-gmake Use gmake instead of the default make command
to build
+# -use-gmake Use gmake instead of the default make command to build
# llvm and run tests.
#
# Options to configure llvm-test
@@ -61,6 +61,14 @@
# -noexternals Do not run the external tests (for cases where povray
# or SPEC are not installed)
# -with-externals Specify a directory where the external tests are located.
+# -submit-server Specifies a server to submit the test results too. If this
+# option is not specified it defaults to
+# llvm.org. This is basically just the address of the
+# webserver
+# -submit-script Specifies which script to call on the submit server. If
+# this option is not specified it defaults to
+# /nightlytest/NightlyTestAccept.cgi. This is basically
+# everything after the www.yourserver.org.
#
# CVSROOT is the CVS repository from which the tree will be checked out,
# specified either in the full :method:[EMAIL PROTECTED]:/dir syntax, or
@@ -111,6 +119,8 @@
$NOTEST=0;
$NORUNNINGTESTS=0;
$MAKECMD=make;
+$SUBMITSERVER = llvm.org;
+$SUBMITSCRIPT = /nightlytest/NightlyTestAccept.cgi;
while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
shift;
@@ -142,6 +152,12 @@
if (/^-with-externals$/) {
$CONFIGUREARGS .= --with-externals=$ARGV[0]; shift; next;
}
+if (/^-submit-server/) {
+ $SUBMITSERVER = $ARGV[0]; shift; next;
+}
+if (/^-submit-script/) {
+ $SUBMITSCRIPT = $ARGV[0]; shift; next;
+}
if (/^-nickname$/) { $nickname = $ARGV[0]; shift; next; }
if (/^-gccpath/) { $CONFIGUREARGS .=
CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++;
@@ -996,9 +1012,6 @@
if ( $VERBOSE ) { print SEND THE DATA VIA THE POST REQUEST\n; }
-
-my $host = llvm.org;
-my $file = /nightlytest/NightlyTestAccept.cgi;
my %hash_of_data = ('machine_data' = $machine_data,
'build_data' = $build_data,
'gcc_version' = $gcc_version,
@@ -1049,7 +1062,7 @@
}
}
else{
-my $response = SendData $host,$file,\%hash_of_data;
+my $response = SendData $SUBMITSERVER,$SUBMITSCRIPT,\%hash_of_data;
if( $VERBOSE) { print \n$response; }
}
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.46 - 1.47
---
Log message:
Merge some NightlyTest.pl changes.
---
Diffs of the changes: (+5 -1)
NewNightlyTest.pl |6 +-
1 files changed, 5 insertions(+), 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.46 llvm/utils/NewNightlyTest.pl:1.47
--- llvm/utils/NewNightlyTest.pl:1.46 Mon Aug 7 21:03:53 2006
+++ llvm/utils/NewNightlyTest.plWed Aug 9 00:45:12 2006
@@ -132,6 +132,7 @@
$CONFIGUREARGS .= --disable-llc_diffs; next;
}
if (/^-disable-jit$/){ $PROGTESTOPTS .= DISABLE_JIT=1;
$CONFIGUREARGS .= --disable-jit; next; }
+if (/^-disable-cbe$/){ $PROGTESTOPTS .= DISABLE_CBE=1; next; }
if (/^-verbose$/){ $VERBOSE = 1; next; }
if (/^-debug$/) { $DEBUG = 1; next; }
if (/^-nice$/) { $NICE = nice ; next; }
@@ -168,8 +169,11 @@
if (/^-use-gmake/){
$MAKECMD = gmake; shift; next;
}
+if (/^-compileflags/){
+$MAKEOPTS = $MAKEOPTS $ARGV[0]; shift; next;
+}
if (/^-extraflags/) {
- $PROGTESTOPTS .= EXTRA_FLAGS=\'$ARGV[0]\'; shift; next;
+$CONFIGUREARGS .= --with-extra-options=\'$ARGV[0]\'; shift; next;
}
if (/^-noexternals$/){ $NOEXTERNALS = 1; next; }
if (/^-nodejagnu$/) { $NODEJAGNU = 1; next; }
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.45 - 1.46
---
Log message:
Removed unneccesary output from nightly tester
---
Diffs of the changes: (+3 -3)
NewNightlyTest.pl |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.45 llvm/utils/NewNightlyTest.pl:1.46
--- llvm/utils/NewNightlyTest.pl:1.45 Sun Aug 6 20:54:37 2006
+++ llvm/utils/NewNightlyTest.plMon Aug 7 21:03:53 2006
@@ -842,11 +842,11 @@
}
($SingleSourceProgramsTable, $llcbeta_options) =
TestDirectory(SingleSource);
WriteFile $Prefix-singlesourceprogramstable.txt,
$SingleSourceProgramsTable;
+ if ( $VERBOSE ) {
+ print MultiSource TEST STAGE\n;
+ }
($MultiSourceProgramsTable, $llcbeta_options) =
TestDirectory(MultiSource);
WriteFile $Prefix-multisourceprogramstable.txt,
$MultiSourceProgramsTable;
- if ( $VERBOSE ) {
- print MultiSource returned $MultiSourceProgramsTable\n;
- }
if ( ! $NOEXTERNALS ) {
if ( $VERBOSE ) {
print External TEST STAGE\n;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils: NewNightlyTest.pl updated: 1.43 - 1.44 --- Log message: no longer sending the list of all dejagnu tests because it is too big at the present time --- Diffs of the changes: (+1 -1) NewNightlyTest.pl |2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: llvm/utils/NewNightlyTest.pl diff -u llvm/utils/NewNightlyTest.pl:1.43 llvm/utils/NewNightlyTest.pl:1.44 --- llvm/utils/NewNightlyTest.pl:1.43 Fri Aug 4 16:42:58 2006 +++ llvm/utils/NewNightlyTest.plSun Aug 6 16:47:43 2006 @@ -1026,7 +1026,7 @@ 'passing_tests' = $passes, 'expfail_tests' = $xfails, 'unexpfail_tests' = $fails, - 'all_tests' = $dejagnu_test_list, + 'all_tests' = , #$dejagnu_test_list, 'new_tests' = , 'removed_tests' = , 'dejagnutests_log' = $dejagnutests_log, ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils: NewNightlyTest.pl updated: 1.44 - 1.45 --- Log message: Reinstated the sending of a list of all dejagnutests run. Also fixed a rather embarresing error introduced during version 1.41 where i commented out the actual sending of the data to the results server. --- Diffs of the changes: (+0 -0) 0 files changed ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.39 - 1.40
---
Log message:
We should now send the correct list of dejagnu tests instead of the csv file of
test results when we submit results back to the nightly tester.
---
Diffs of the changes: (+5 -1)
NewNightlyTest.pl |6 +-
1 files changed, 5 insertions(+), 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.39 llvm/utils/NewNightlyTest.pl:1.40
--- llvm/utils/NewNightlyTest.pl:1.39 Thu Aug 3 11:28:58 2006
+++ llvm/utils/NewNightlyTest.plFri Aug 4 12:40:54 2006
@@ -877,6 +877,7 @@
##
my $dejagnu = ReadFile $DejagnuSum;
my @DEJAGNU = split \n, $dejagnu;
+my $dejagnu_test_list=;
my $passes=,
my $fails=;
@@ -886,12 +887,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;
}
}
}
@@ -1025,7 +1029,7 @@
'passing_tests' = $passes,
'expfail_tests' = $xfails,
'unexpfail_tests' = $fails,
- 'all_tests' = $all_tests,
+ 'all_tests' = $dejagnu_test_list,
'new_tests' = ,
'removed_tests' = ,
'dejagnutests_log' = $dejagnutests_log,
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.40 - 1.41
---
Log message:
Encapsulated all of the print statements in if( $VERBOSE) { }. The testing
script will be absoutely silent now except for errors, which will still be
printed to the annoyance of the user.
---
Diffs of the changes: (+6 -6)
NewNightlyTest.pl | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.40 llvm/utils/NewNightlyTest.pl:1.41
--- llvm/utils/NewNightlyTest.pl:1.40 Fri Aug 4 12:40:54 2006
+++ llvm/utils/NewNightlyTest.plFri Aug 4 12:53:27 2006
@@ -185,7 +185,7 @@
}
-if (@ARGV != 0 and @ARGV != 3){
+if (@ARGV != 0 and @ARGV != 3 and $VERBOSE){
foreach $x (@ARGV){
print $x\n;
}
@@ -376,7 +376,7 @@
my $firstline;
$/ = \n; #Make sure we're going line at a time.
-print DEJAGNU TEST RESULTS:\n;
+if( $VERBOSE) { print DEJAGNU TEST RESULTS:\n; }
if (open SRCHFILE, $filename) {
# Process test results
@@ -394,10 +394,10 @@
$first_list = 0;
$should_break = 1;
push(@lines, $_\n);
- print $_\n;
+ if( $VERBOSE) { print $_\n; }
} else {
push(@lines, $_\n);
- print $_\n;
+ if( $VERBOSE) { print $_\n; }
}
} #elsif ( m/Summary/ ) {
#if ( $first_list ) {
@@ -414,7 +414,7 @@
#}
elsif ( $readingsum ) {
push(@lines,$_\n);
- print $_\n;
+ if( $VERBOSE) { print $_\n; }
}
}
@@ -460,7 +460,7 @@
$send.= Content-length: $length\n\n;
$send.= $content;
-print SOCK $send;
+#print SOCK $send;
my $result;
while(SOCK){
$result .= $_;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.41 - 1.42
---
Log message:
Made some more changes to the print statements in the nightly tester. The last
commit was a preemptive strike.
---
Diffs of the changes: (+7 -10)
NewNightlyTest.pl | 17 +++--
1 files changed, 7 insertions(+), 10 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.41 llvm/utils/NewNightlyTest.pl:1.42
--- llvm/utils/NewNightlyTest.pl:1.41 Fri Aug 4 12:53:27 2006
+++ llvm/utils/NewNightlyTest.plFri Aug 4 12:55:01 2006
@@ -665,7 +665,7 @@
`grep '^$MAKECMD: \*\*\*.*Stop.' $BuildLog | wc -l`+0) {
$BuildStatus = Error: compilation aborted;
$BuildError = 1;
-print \n***ERROR BUILDING TREE\n\n;
+if( $VERBOSE) { print \n***ERROR BUILDING TREE\n\n; }
}
if ($BuildError) { $NODEJAGNU=1; }
@@ -750,10 +750,6 @@
$DejagnuTime = 0.0 unless $DejagnuTime;
$DejagnuWallTime = 0.0 unless $DejagnuWallTime;
-if ($DEBUG) {
-print $DejagnuTestResults;
-}
-
##
#
# Get warnings from the build
@@ -808,8 +804,10 @@
# Run the programs tests... creating a report.nightly.csv file
if (!$NOTEST) {
- print $MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv .
- TEST=nightly $ProgramTestLog 21\n;
+ if( $VERBOSE) {
+ print $MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv
.
+TEST=nightly $ProgramTestLog 21\n;
+}
system $MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv
.
TEST=nightly $ProgramTestLog 21;
$llcbeta_options=`$MAKECMD print-llcbeta-option`;
@@ -840,7 +838,7 @@
if (!$BuildError) {
if ( $VERBOSE ) {
-print SingleSource TEST STAGE\n;
+ print SingleSource TEST STAGE\n;
}
($SingleSourceProgramsTable, $llcbeta_options) =
TestDirectory(SingleSource);
WriteFile $Prefix-singlesourceprogramstable.txt,
$SingleSourceProgramsTable;
@@ -977,7 +975,6 @@
my $gcc_version_long=;
if($GCCPATH ne ){
$gcc_version_long = `$GCCPATH/gcc --version`;
- print $GCCPATH/gcc --version\n;
}
else{
$gcc_version_long = `gcc --version`;
@@ -1049,7 +1046,7 @@
}
else{
my $response = SendData $host,$file,\%hash_of_data;
-print \n$response;
+if( $VERBOSE) { print \n$response; }
}
##
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.42 - 1.43
---
Log message:
Changed a = to a .= so we now append tests we have performed to the master list
of all tests instead of assigning it as the master list.
---
Diffs of the changes: (+3 -3)
NewNightlyTest.pl |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.42 llvm/utils/NewNightlyTest.pl:1.43
--- llvm/utils/NewNightlyTest.pl:1.42 Fri Aug 4 12:55:01 2006
+++ llvm/utils/NewNightlyTest.plFri Aug 4 16:42:58 2006
@@ -885,15 +885,15 @@
for($x=0; $x@DEJAGNU; $x++){
if($DEJAGNU[$x] =~ m/^PASS:/){
$passes.=$DEJAGNU[$x]\n;
- $dejagnu_test_list=$DEJAGNU[$x]\n;
+ $dejagnu_test_list.=$DEJAGNU[$x]\n;
}
elsif($DEJAGNU[$x] =~ m/^FAIL:/){
$fails.=$DEJAGNU[$x]\n;
- $dejagnu_test_list=$DEJAGNU[$x]\n;
+ $dejagnu_test_list.=$DEJAGNU[$x]\n;
}
elsif($DEJAGNU[$x] =~ m/^XFAIL:/){
$xfails.=$DEJAGNU[$x]\n;
- $dejagnu_test_list=$DEJAGNU[$x]\n;
+ $dejagnu_test_list.=$DEJAGNU[$x]\n;
}
}
}
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.38 - 1.39
---
Log message:
One of the directories we were searching in for .o and .a files was wrong. We
now search /lib instead of /libs.
---
Diffs of the changes: (+2 -2)
NewNightlyTest.pl |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.38 llvm/utils/NewNightlyTest.pl:1.39
--- llvm/utils/NewNightlyTest.pl:1.38 Wed Aug 2 18:48:07 2006
+++ llvm/utils/NewNightlyTest.plThu Aug 3 11:28:58 2006
@@ -677,7 +677,7 @@
}
ChangeDir( $BuildDir/llvm, Build Directory );
$afiles.= `find utils/ -iname '*.a' -ls`;
- $afiles.= `find libs/ -iname '*.a' -ls`;
+ $afiles.= `find lib/ -iname '*.a' -ls`;
$afiles.= `find tools/ -iname '*.a' -ls`;
if($BUILDTYPE eq release){
$afiles.= `find Release/ -iname '*.a' -ls`;
@@ -688,7 +688,7 @@
$ofiles.= `find utils/ -iname '*.o' -ls`;
- $ofiles.= `find libs/ -iname '*.o' -ls`;
+ $ofiles.= `find lib/ -iname '*.o' -ls`;
$ofiles.= `find tools/ -iname '*.o' -ls`;
if($BUILDTYPE eq release){
$ofiles.= `find Release/ -iname '*.o' -ls`;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.37 - 1.38
---
Log message:
We now only search the following directories for .o and .a files:
utils/
libs/
tools/
Release/ Debug/
as per Chris.
---
Diffs of the changes: (+22 -3)
NewNightlyTest.pl | 25 ++---
1 files changed, 22 insertions(+), 3 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.37 llvm/utils/NewNightlyTest.pl:1.38
--- llvm/utils/NewNightlyTest.pl:1.37 Wed Aug 2 13:37:40 2006
+++ llvm/utils/NewNightlyTest.plWed Aug 2 18:48:07 2006
@@ -676,8 +676,27 @@
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.= `find utils/ -iname '*.a' -ls`;
+ $afiles.= `find libs/ -iname '*.a' -ls`;
+ $afiles.= `find tools/ -iname '*.a' -ls`;
+ if($BUILDTYPE eq release){
+ $afiles.= `find Release/ -iname '*.a' -ls`;
+ }
+ else{
+ $afiles.= `find Debug/ -iname '*.a' -ls`;
+ }
+
+
+ $ofiles.= `find utils/ -iname '*.o' -ls`;
+ $ofiles.= `find libs/ -iname '*.o' -ls`;
+ $ofiles.= `find tools/ -iname '*.o' -ls`;
+ if($BUILDTYPE eq release){
+ $ofiles.= `find Release/ -iname '*.o' -ls`;
+ }
+ else{
+ $ofiles.= `find Debug/ -iname '*.o' -ls`;
+ }
+
@AFILES = split \n, $afiles;
$a_file_sizes=;
foreach $x (@AFILES){
@@ -962,7 +981,7 @@
@GCC_VERSION = split '\n', $gcc_version_long;
my $gcc_version = $GCC_VERSION[0];
-my $all_tests = ReadFile, $Prefix-Tests.txt;
+my $all_tests = ReadFile $Prefix-Tests.txt;
##
#
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.35 - 1.36
---
Log message:
fix externals
---
Diffs of the changes: (+2 -2)
NewNightlyTest.pl |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.35 llvm/utils/NewNightlyTest.pl:1.36
--- llvm/utils/NewNightlyTest.pl:1.35 Thu Jul 27 20:06:18 2006
+++ llvm/utils/NewNightlyTest.plFri Jul 28 23:27:34 2006
@@ -138,8 +138,8 @@
if (/^-f2c$/){
$CONFIGUREARGS .= --with-f2c=$ARGV[0]; shift; next;
}
-if (/^-with-externals/) {
- $CONFIGUREARGS .= --with-externals=$ARGV[0]; shift; next;
+if (/^-with-externals$/) {
+ $CONFIGUREARGS .= --with-externals=$ARGV[0]; shift; next;
}
if (/^-nickname$/) { $nickname = $ARGV[0]; shift; next; }
if (/^-gccpath/) { $CONFIGUREARGS .=
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.31 - 1.32
---
Log message:
Fixed a stupid error where changedir returned false upon success.
---
Diffs of the changes: (+1 -2)
NewNightlyTest.pl |3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.31 llvm/utils/NewNightlyTest.pl:1.32
--- llvm/utils/NewNightlyTest.pl:1.31 Thu Jul 27 14:00:01 2006
+++ llvm/utils/NewNightlyTest.plThu Jul 27 14:22:06 2006
@@ -307,7 +307,6 @@
print ERROR!!! Cannot change directory to: $name ($dir) because $!;
return -1;
}
-return 0;
}
#~
@@ -783,7 +782,7 @@
sub TestDirectory {
my $SubDir = shift;
- ChangeDir( projects/llvm-test/$SubDir, Programs Test Subdirectory )
|| return (, );
+ ChangeDir( $BuildDir/llvm/projects/llvm-test/$SubDir, Programs Test
Subdirectory ) || return (, );
my $ProgramTestLog = $Prefix-$SubDir-ProgramTest.txt;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.32 - 1.33
---
Log message:
ChangeDir now returns the correct value
---
Diffs of the changes: (+2 -1)
NewNightlyTest.pl |3 ++-
1 files changed, 2 insertions(+), 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.32 llvm/utils/NewNightlyTest.pl:1.33
--- llvm/utils/NewNightlyTest.pl:1.32 Thu Jul 27 14:22:06 2006
+++ llvm/utils/NewNightlyTest.plThu Jul 27 15:21:26 2006
@@ -305,8 +305,9 @@
$result = chdir($dir);
if(!$result){
print ERROR!!! Cannot change directory to: $name ($dir) because $!;
- return -1;
+ return false;
}
+return true;
}
#~
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.34 - 1.35
---
Log message:
Removed some unneccesary printing from the nightly tester.
---
Diffs of the changes: (+0 -6)
NewNightlyTest.pl |6 --
1 files changed, 6 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.34 llvm/utils/NewNightlyTest.pl:1.35
--- llvm/utils/NewNightlyTest.pl:1.34 Thu Jul 27 16:01:39 2006
+++ llvm/utils/NewNightlyTest.plThu Jul 27 20:06:18 2006
@@ -824,13 +824,7 @@
print SingleSource TEST STAGE\n;
}
($SingleSourceProgramsTable, $llcbeta_options) =
TestDirectory(SingleSource);
- if ( $VERBOSE ) {
-print SingleSource returned $SingleSourceProgramsTable\n;
- }
WriteFile $Prefix-singlesourceprogramstable.txt,
$SingleSourceProgramsTable;
- if ( $VERBOSE ) {
- print MultiSource TEST STAGE\n;
- }
($MultiSourceProgramsTable, $llcbeta_options) =
TestDirectory(MultiSource);
WriteFile $Prefix-multisourceprogramstable.txt,
$MultiSourceProgramsTable;
if ( $VERBOSE ) {
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.26 - 1.27
---
Log message:
This change will allow support for SunOS to the testing script. It adds a check
to see if we're running on SunOS and if so, then uses gmake instead of make.
---
Diffs of the changes: (+39 -17)
NewNightlyTest.pl | 56 +-
1 files changed, 39 insertions(+), 17 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.26 llvm/utils/NewNightlyTest.pl:1.27
--- llvm/utils/NewNightlyTest.pl:1.26 Sun Jul 23 17:57:28 2006
+++ llvm/utils/NewNightlyTest.plWed Jul 26 20:03:46 2006
@@ -178,7 +178,13 @@
$CONFIGUREARGS .= --enable-jit;
}
-die Must specify 0 or 3 options! if (@ARGV != 0 and @ARGV != 3);
+
+if (@ARGV != 0 and @ARGV != 3){
+ foreach $x (@ARGV){
+ print $x\n;
+ }
+ print Must specify 0 or 3 options!;
+}
if (@ARGV == 3) {
$CVSRootDir = $ARGV[0];
@@ -186,6 +192,13 @@
$WebDir = $ARGV[2];
}
+if($CVSRootDir eq or
+ $BuildDir eq or
+ $WebDir eq ){
+ die(please specify a cvs root directory, a build directory, and a .
+ web directory);
+ }
+
if($nickname eq ){
die (Please invoke NewNightlyTest.pl with command line option
\-nickname nickname\);
}
@@ -193,6 +206,15 @@
$BUILDTYPE = debug;
}
+#FIXME: this is a hack for SunOS, there must be a better way
+if(`uname` eq SunOS){
+ $MAKECMD = gmake;
+}
+else {
+ $MAKECMD=make;
+}
+
+
##
#
#define the file names we'll use
@@ -596,11 +618,11 @@
system (time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) $BuildLog
21;
if ( $VERBOSE )
{
- print BUILD STAGE:\n;
- print (time -p $NICE make $MAKEOPTS) $BuildLog 21\n;
+ print BUILD STAGE:\n;
+ print (time -p $NICE $MAKECMD $MAKEOPTS) $BuildLog
21\n;
}
# Build the entire tree, capturing the output into $BuildLog
-system (time -p $NICE make $MAKEOPTS) $BuildLog 21;
+system (time -p $NICE $MAKECMD $MAKEOPTS) $BuildLog 21;
}
@@ -637,8 +659,8 @@
$BuildStatus = Skipped by user;
$BuildError = 1;
}
-elsif (`grep '^make[^:]*: .*Error' $BuildLog | wc -l` + 0 ||
-`grep '^make: \*\*\*.*Stop.' $BuildLog | wc -l`+0) {
+elsif (`grep '^$MAKECMD\[^:]*: .*Error' $BuildLog | wc -l` + 0 ||
+`grep '^$MAKECMD: \*\*\*.*Stop.' $BuildLog | wc -l`+0) {
$BuildStatus = Error: compilation aborted;
$BuildError = 1;
print \n***ERROR BUILDING TREE\n\n;
@@ -683,13 +705,13 @@
if(!$NODEJAGNU) {
if($VERBOSE)
{
- print DEJAGNU FEATURE/REGRESSION TEST STAGE:\n;
- print (time -p make $MAKEOPTS check) $dejagnu_output 21\n;
+ print DEJAGNU FEATURE/REGRESSION TEST STAGE:\n;
+ print (time -p $MAKECMD $MAKEOPTS check)
$dejagnu_output 21\n;
}
#Run the feature and regression tests, results are put into testrun.sum
#Full log in testrun.log
-system (time -p make $MAKEOPTS check) $dejagnu_output 21;
+system (time -p $MAKECMD $MAKEOPTS check) $dejagnu_output 21;
#Copy the testrun.log and testrun.sum to our webdir
CopyFile(test/testrun.log, $DejagnuLog);
@@ -766,19 +788,19 @@
# Run the programs tests... creating a report.nightly.csv file
if (!$NOTEST) {
- print make -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv
+ print $MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv
. TEST=nightly $ProgramTestLog 21\n;
- system make -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv
+ system $MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv
. TEST=nightly $ProgramTestLog 21;
- $llcbeta_options=`make print-llcbeta-option`;
+ $llcbeta_options=`$MAKECMD print-llcbeta-option`;
}
my $ProgramsTable;
-if (`grep '^make[^:]: .*Error' $ProgramTestLog | wc -l` + 0){
+if (`grep '^$MAKECMD\[^:]: .*Error' $ProgramTestLog | wc -l` + 0){
$TestError = 1;
$ProgramsTable=Error running test $SubDir\n;
print ERROR TESTING\n;
-} elsif (`grep '^make[^:]: .*No rule to make target' $ProgramTestLog | wc
-l` + 0) {
+} elsif (`grep '^$MAKECMD\[^:]: .*No rule to make target' $ProgramTestLog
| wc -l` + 0) {
$TestError = 1;
$ProgramsTable=Makefile error running tests $SubDir!\n;
print ERROR TESTING\n;
@@ -925,13 +947,13 @@
Olden Test Directory);
# Clean out previous results...
- system $NICE make $MAKEOPTS clean /dev/null 21;
+ system $NICE $MAKECMD $MAKEOPTS clean /dev/null 21;
# Run the nightly test in this directory, with LARGE_PROBLEM_SIZE and
# GET_STABLE_NUMBERS enabled!
- if( $VERBOSE ) { print make -k $MAKEOPTS $PROGTESTOPTS
report.nightly.csv.out TEST=nightly
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.27 - 1.28
---
Log message:
added support for the -use-gmake option. This will come in handy when running
the test on SunOS.
---
Diffs of the changes: (+10 -12)
NewNightlyTest.pl | 22 ++
1 files changed, 10 insertions(+), 12 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.27 llvm/utils/NewNightlyTest.pl:1.28
--- llvm/utils/NewNightlyTest.pl:1.27 Wed Jul 26 20:03:46 2006
+++ llvm/utils/NewNightlyTest.plWed Jul 26 20:17:17 2006
@@ -52,6 +52,8 @@
# the default.
# -compileflagsNext argument specifies extra options passed to make when
# building LLVM.
+# -use-gmake Use gmake instead of the default make command
to build
+# llvm and run tests.
#
# Options to configure llvm-test
# -extraflags Next argument specifies extra options that are passed to
@@ -108,6 +110,7 @@
$nickname=;
$NOTEST=0;
$NORUNNINGTESTS=0;
+$MAKECMD=make;
while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
shift;
@@ -122,8 +125,8 @@
if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
if (/^-parallel$/) { $MAKEOPTS = $MAKEOPTS -j2 -l3.0; next; }
if (/^-release$/){ $MAKEOPTS = $MAKEOPTS ENABLE_OPTIMIZED=1 .
- OPTIMIZE_OPTION=-O2;
- $BUILDTYPE=release; next; }
+
OPTIMIZE_OPTION=-O2;
+
$BUILDTYPE=release; next; }
if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= ENABLE_LLCBETA=1; next; }
if (/^-disable-llc$/){ $PROGTESTOPTS .= DISABLE_LLC=1;
$CONFIGUREARGS .= --disable-llc_diffs; next;
}
@@ -162,6 +165,9 @@
if (/^-compileflags/){
$MAKEOPTS = $MAKEOPTS $ARGV[0]; shift; next;
}
+if (/^-use-gmake/){
+ $MAKECMD = ARGV[0]; shift; next;
+}
if (/^-extraflags/) {
$PROGTESTOPTS .= EXTRA_FLAGS=\'$ARGV[0]\'; shift; next;
}
@@ -202,19 +208,11 @@
if($nickname eq ){
die (Please invoke NewNightlyTest.pl with command line option
\-nickname nickname\);
}
-if($BUILDTYPE ne releaese){
- $BUILDTYPE = debug;
-}
-#FIXME: this is a hack for SunOS, there must be a better way
-if(`uname` eq SunOS){
- $MAKECMD = gmake;
-}
-else {
- $MAKECMD=make;
+if($BUILDTYPE ne release){
+ $BUILDTYPE = debug;
}
-
##
#
#define the file names we'll use
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.28 - 1.29
---
Log message:
I made a stupid mistake when adding support for -use-gmake. ~PJ
---
Diffs of the changes: (+1 -1)
NewNightlyTest.pl |2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.28 llvm/utils/NewNightlyTest.pl:1.29
--- llvm/utils/NewNightlyTest.pl:1.28 Wed Jul 26 20:17:17 2006
+++ llvm/utils/NewNightlyTest.plWed Jul 26 20:24:35 2006
@@ -166,7 +166,7 @@
$MAKEOPTS = $MAKEOPTS $ARGV[0]; shift; next;
}
if (/^-use-gmake/){
- $MAKECMD = ARGV[0]; shift; next;
+ $MAKECMD = gmake; shift; next;
}
if (/^-extraflags/) {
$PROGTESTOPTS .= EXTRA_FLAGS=\'$ARGV[0]\'; shift; next;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.24 - 1.25
---
Log message:
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.
---
Diffs of the changes: (+32 -25)
NewNightlyTest.pl | 57 ++
1 files changed, 32 insertions(+), 25 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.24 llvm/utils/NewNightlyTest.pl:1.25
--- llvm/utils/NewNightlyTest.pl:1.24 Fri Jul 21 19:00:08 2006
+++ llvm/utils/NewNightlyTest.plSun Jul 23 16:38:07 2006
@@ -200,7 +200,7 @@
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 @@
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 @@
#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 @@
}
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 @@
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!
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.25 - 1.26
---
Log message:
Fixing a syntax error and adding buildtype to the .a and .o file size
information.
---
Diffs of the changes: (+8 -4)
NewNightlyTest.pl | 12
1 files changed, 8 insertions(+), 4 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.25 llvm/utils/NewNightlyTest.pl:1.26
--- llvm/utils/NewNightlyTest.pl:1.25 Sun Jul 23 16:38:07 2006
+++ llvm/utils/NewNightlyTest.plSun Jul 23 17:57:28 2006
@@ -122,7 +122,8 @@
if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
if (/^-parallel$/) { $MAKEOPTS = $MAKEOPTS -j2 -l3.0; next; }
if (/^-release$/){ $MAKEOPTS = $MAKEOPTS ENABLE_OPTIMIZED=1 .
-
OPTIMIZE_OPTION=-O2; next; }
+ OPTIMIZE_OPTION=-O2;
+ $BUILDTYPE=release; next; }
if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= ENABLE_LLCBETA=1; next; }
if (/^-disable-llc$/){ $PROGTESTOPTS .= DISABLE_LLC=1;
$CONFIGUREARGS .= --disable-llc_diffs; next;
}
@@ -188,6 +189,9 @@
if($nickname eq ){
die (Please invoke NewNightlyTest.pl with command line option
\-nickname nickname\);
}
+if($BUILDTYPE ne releaese){
+ $BUILDTYPE = debug;
+}
##
#
@@ -200,7 +204,7 @@
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;
@@ -654,13 +658,13 @@
$a_file_sizes=;
foreach $x (@AFILES){
$x =~ m/.+\s+.+\s+.+\s+.+\s+.+\s+.+\s+(.+)\s+.+\s+.+\s+.+\s+(.+)/;
- $a_file_sizes.=$1 $2\n;
+ $a_file_sizes.=$1 $2 $BUILDTYPE\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;
+ $o_file_sizes.=$1 $2 $BUILDTYPE\n;
}
}
else{
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.20 - 1.21
---
Log message:
Added code to get .a and .o file sizes and submit them to the server in the
nightly report.
---
Diffs of the changes: (+19 -1)
NewNightlyTest.pl | 20 +++-
1 files changed, 19 insertions(+), 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.20 llvm/utils/NewNightlyTest.pl:1.21
--- llvm/utils/NewNightlyTest.pl:1.20 Thu Jul 20 20:39:42 2006
+++ llvm/utils/NewNightlyTest.plFri Jul 21 14:51:40 2006
@@ -612,6 +612,22 @@
#my $NumLibraries = scalar(grep(!/executable/, @Linked));
#my $NumObjects = `grep ']\: Compiling ' $BuildLog | wc -l` + 0;
+if(!$BuildError){
+ 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;
@@ -1048,7 +1064,9 @@
'dejagnutests_log' = $dejagnutests_log,
'dejagnutests_sum' = $dejagnutests_sum,
'starttime' = $starttime,
-
'endtime' = $endtime);
+
'endtime' = $endtime,
+
'o_file_sizes' = $o_file_sizes,
+
'a_file_sizes' = $a_file_sizes);
$TESTING = 0;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.21 - 1.22
---
Log message:
Fixed an issue of variable scope that prevented file size from being submitted
to the server.
---
Diffs of the changes: (+6 -4)
NewNightlyTest.pl | 10 ++
1 files changed, 6 insertions(+), 4 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.21 llvm/utils/NewNightlyTest.pl:1.22
--- llvm/utils/NewNightlyTest.pl:1.21 Fri Jul 21 14:51:40 2006
+++ llvm/utils/NewNightlyTest.plFri Jul 21 16:43:09 2006
@@ -1,5 +1,4 @@
#!/usr/bin/perl
-
use POSIX qw(strftime);
use File::Copy;
use Socket;
@@ -455,7 +454,7 @@
# Getting Start timestamp
#
##
-$starttime = `date`;
+$starttime = `date +20%y-%m-%d %H:%M:%S`;
##
#
@@ -612,6 +611,8 @@
#my $NumLibraries = scalar(grep(!/executable/, @Linked));
#my $NumObjects = `grep ']\: Compiling ' $BuildLog | wc -l` + 0;
+my $a_file_sizes=;
+my $o_file_sizes=;
if(!$BuildError){
ChangeDir( $BuildDir, Build Directory );
$afiles = `find . -iname '*.a' -ls`;
@@ -621,7 +622,8 @@
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;
+ }
+ @OFILES = split \n, $ofiles;
$o_file_sizes=;
foreach $x (@OFILES){
$x =~ m/.+\s+.+\s+.+\s+.+\s+.+\s+.+\s+(.+)\s+.+\s+.+\s+.+\s+(.+)/;
@@ -960,7 +962,7 @@
# Getting end timestamp
#
##
-$endtime = `date`;
+$endtime = `date +20%y-%m-%d %H:%M:%S`;
##
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.22 - 1.23
---
Log message:
Added a check to skip dejagnu test results gathering if we did not run dejagnu
tests
---
Diffs of the changes: (+13 -11)
NewNightlyTest.pl | 24 +---
1 files changed, 13 insertions(+), 11 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.22 llvm/utils/NewNightlyTest.pl:1.23
--- llvm/utils/NewNightlyTest.pl:1.22 Fri Jul 21 16:43:09 2006
+++ llvm/utils/NewNightlyTest.plFri Jul 21 16:58:06 2006
@@ -832,22 +832,24 @@
#
#
##
-$dejagnu = ReadFile $DejagnuSum;
[EMAIL PROTECTED] = split \n, $dejagnu;
+my $dejagnu = ReadFile $DejagnuSum;
+my @DEJAGNU = split \n, $dejagnu;
my $passes=,
my $fails=;
my $xfails=;
-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;
+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;
+ }
}
}
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.23 - 1.24
---
Log message:
added status message during nightly test
---
Diffs of the changes: (+4 -2)
NewNightlyTest.pl |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.23 llvm/utils/NewNightlyTest.pl:1.24
--- llvm/utils/NewNightlyTest.pl:1.23 Fri Jul 21 16:58:06 2006
+++ llvm/utils/NewNightlyTest.plFri Jul 21 19:00:08 2006
@@ -584,8 +584,7 @@
##
if (!$NOCHECKOUT !$NOBUILD) {
my $EXTRAFLAGS = --enable-spec --with-objroot=.;
-if ( $VERBOSE )
-{
+if ( $VERBOSE ){
print CONFIGURE STAGE:\n;
print (time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS)
$BuildLog 21\n;
}
@@ -614,6 +613,9 @@
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`;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.16 - 1.17
---
Log message:
Fixed a problem that caused the script to abort right before it sent out the
information
---
Diffs of the changes: (+1 -1)
NewNightlyTest.pl |2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.16 llvm/utils/NewNightlyTest.pl:1.17
--- llvm/utils/NewNightlyTest.pl:1.16 Wed Jul 19 12:52:51 2006
+++ llvm/utils/NewNightlyTest.plThu Jul 20 11:54:43 2006
@@ -979,7 +979,7 @@
@DEJAGNULOG_FULL = ReadFile $DejagnuTestsLog;
$dejagnulog_full = join(\n, @DEJAGNULOG_FULL);
-newmy $gcc_version_long=;
+my $gcc_version_long=;
if($GCCPATH ne ){
$gcc_version_long = `$GCCPATH/gcc --version`;
print $GCCPATH/gcc --version\n;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.17 - 1.18
---
Log message:
We now fail and print an error message if a nightly tester does not specify a
nickname on the command line
---
Diffs of the changes: (+8 -0)
NewNightlyTest.pl |8
1 files changed, 8 insertions(+)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.17 llvm/utils/NewNightlyTest.pl:1.18
--- llvm/utils/NewNightlyTest.pl:1.17 Thu Jul 20 11:54:43 2006
+++ llvm/utils/NewNightlyTest.plThu Jul 20 17:28:43 2006
@@ -139,6 +139,7 @@
$CONFIGUREARGS .= --with-externals=$ARGV[0]; shift; next;
}
if (/^-nickname$/) { $nickname = $ARGV[0]; shift; next; }
+else{ $nickname=; }
if (/^-gccpath/) { $CONFIGUREARGS .=
CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++;
$GCCPATH=$ARGV[0];
@@ -186,6 +187,10 @@
$WebDir = $ARGV[2];
}
+if($nickname eq ){
+ die (Please invoke NewNightlyTest.pl with command line option
\-nickname nickname\);
+}
+
##
#
#define the file names we'll use
@@ -461,6 +466,9 @@
if (!$NOCHECKOUT) {
if (-d $BuildDir) {
if (!$NOREMOVE) {
+ if ( $VERBOSE ){
+ print Build directory exists! Removing it\n;
+ }
system rm -rf $BuildDir;
} else {
die CVS checkout directory $BuildDir already exists!;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.18 - 1.19
---
Log message:
The nightly tester will no longer report numbers instead of tests performed.
---
Diffs of the changes: (+3 -3)
NewNightlyTest.pl |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.18 llvm/utils/NewNightlyTest.pl:1.19
--- llvm/utils/NewNightlyTest.pl:1.18 Thu Jul 20 17:28:43 2006
+++ llvm/utils/NewNightlyTest.plThu Jul 20 20:34:01 2006
@@ -824,13 +824,13 @@
for($x=0; $x@DEJAGNU; $x++){
if($DEJAGNU[$x] =~ m/^PASS:/){
- $passes.=$x\n;
+ $passes.=$DEJAGNU[$x]\n;
}
elsif($DEJAGNU[$x] =~ m/^FAIL:/){
- $fails.=$x\n;
+ $fails.=$DEJAGNU[$x]\n;
}
elsif($DEJAGNU[$x] =~ m/^XFAIL:/){
- $xfails.=$x\n;
+ $xfails.=$DEJAGNU[$x]\n;
}
}
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.19 - 1.20
---
Log message:
Fixed issue where nightly test always tells you you need to use -nickname
---
Diffs of the changes: (+1 -2)
NewNightlyTest.pl |3 +--
1 files changed, 1 insertion(+), 2 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.19 llvm/utils/NewNightlyTest.pl:1.20
--- llvm/utils/NewNightlyTest.pl:1.19 Thu Jul 20 20:34:01 2006
+++ llvm/utils/NewNightlyTest.plThu Jul 20 20:39:42 2006
@@ -106,7 +106,7 @@
#
##
$CONFIGUREARGS=;
-
+$nickname=;
$NOTEST=0;
$NORUNNINGTESTS=0;
@@ -139,7 +139,6 @@
$CONFIGUREARGS .= --with-externals=$ARGV[0]; shift; next;
}
if (/^-nickname$/) { $nickname = $ARGV[0]; shift; next; }
-else{ $nickname=; }
if (/^-gccpath/) { $CONFIGUREARGS .=
CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++;
$GCCPATH=$ARGV[0];
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.14 - 1.15
---
Log message:
yet another change to get the correct gcc version for the nightly test results.
---
Diffs of the changes: (+4 -3)
NewNightlyTest.pl |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.14 llvm/utils/NewNightlyTest.pl:1.15
--- llvm/utils/NewNightlyTest.pl:1.14 Tue Jul 18 12:21:30 2006
+++ llvm/utils/NewNightlyTest.plTue Jul 18 16:21:53 2006
@@ -961,15 +961,16 @@
@DEJAGNULOG_FULL = ReadFile $DejagnuTestsLog;
$dejagnulog_full = join(\n, @DEJAGNULOG_FULL);
+my $gcc_version_long=;
if($GCCPATH ne ){
- my $gcc_version_long = `$GCCPATH/gcc --version`;
+ $gcc_version_long = `$GCCPATH/gcc --version`;
print $GCCPATH/gcc --version\n;
}
else{
- my $gcc_version_long = `gcc --version`;
+ $gcc_version_long = `gcc --version`;
print gcc --version\n;
}
[EMAIL PROTECTED] = split \n, $gcc_version_long;
[EMAIL PROTECTED] = split '\n', $gcc_version_long;
my $gcc_version = $GCC_VERSION[0];
##
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.11 - 1.12
---
Log message:
Fixed an issue where the user specified gcc was not the gcc we report to the
nightly test server.
---
Diffs of the changes: (+10 -2)
NewNightlyTest.pl | 12 ++--
1 files changed, 10 insertions(+), 2 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.11 llvm/utils/NewNightlyTest.pl:1.12
--- llvm/utils/NewNightlyTest.pl:1.11 Thu Jul 13 11:58:42 2006
+++ llvm/utils/NewNightlyTest.plFri Jul 14 15:44:09 2006
@@ -138,7 +138,10 @@
$CONFIGUREARGS .= --with-externals=$ARGV[0]; shift; next;
}
if (/^-nickname$/) { $nickname = $ARGV[0]; shift; next; }
-if (/^-gccpath/) { $CONFIGUREARGS .= CC=$ARGV[0]/gcc
CXX=$ARGV[0]/g++; shift; next;}
+if (/^-gccpath/) { $CONFIGUREARGS .= CC=$ARGV[0]/gcc
CXX=$ARGV[0]/g++;
+ $GCCPATH=$ARGV[0];
+ shift;
+ next;}
if (/^-cvstag/) { $CVSCOOPT .= -r $ARGV[0]; shift; next; }
else{ $CVSCOOPT=;}
if (/^-target/) {
$CONFIGUREARGS .= --target=$ARGV[0]; shift; next;
@@ -953,7 +956,12 @@
@DEJAGNULOG_FULL = ReadFile $DejagnuTestsLog;
$dejagnulog_full = join(\n, @DEJAGNULOG_FULL);
-my $gcc_version_long = `gcc --version`;
+if($GCCPATH){
+ my $gcc_version_long = `$ARGV[0]/gcc --version`;
+}
+else{
+ my $gcc_version_long = `gcc --version`;
+}
@GCC_VERSION = split \n, $gcc_version_long;
my $gcc_version = $GCC_VERSION[0];
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.9 - 1.10
---
Log message:
Fixed some small bugs exposed when trying to get a sparc machine to run the
script. Specifically some misnamed variables.
---
Diffs of the changes: (+6 -6)
NewNightlyTest.pl | 12 ++--
1 files changed, 6 insertions(+), 6 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.9 llvm/utils/NewNightlyTest.pl:1.10
--- llvm/utils/NewNightlyTest.pl:1.9Mon Jul 10 13:35:41 2006
+++ llvm/utils/NewNightlyTest.plThu Jul 13 11:56:48 2006
@@ -542,7 +542,7 @@
$ModifiedFiles{$Filename} = 1;
$UsersCommitted{$UID} = 1;
} elsif ($Type eq 'A') { # Added
- $Addediles{$Filename} = 1;
+ $AddedFiles{$Filename} = 1;
$UsersCommitted{$UID} = 1;
} elsif ($Type eq 'R') { # Removed
$RemovedFiles{$Filename} = 1;
@@ -569,7 +569,7 @@
#
##
if (!$NOCHECKOUT !$NOBUILD) {
-my $EXTRAFLAGS = --enable-spec --with-objroot=.$LLVMTESTCONFIGARGS;
+my $EXTRAFLAGS = --enable-spec --with-objroot=.;
if ( $VERBOSE )
{
print CONFIGURE STAGE:\n;
@@ -766,18 +766,18 @@
if ( $VERBOSE ) {
print SingleSource TEST STAGE\n;
}
-($SingleSourceProgramsTable, $singlesource_llcbeta_options) =
TestDirectory(SingleSource);
+($SingleSourceProgramsTable, $llcbeta_options) =
TestDirectory(SingleSource);
WriteFile $Prefix-singlesourceprogramstable.txt,
$SingleSourceProgramsTable;
if ( $VERBOSE ) {
print MultiSource TEST STAGE\n;
}
-($MultiSourceProgramsTable, $multisource_llcbeta_options) =
TestDirectory(MultiSource);
+($MultiSourceProgramsTable, $llcbeta_options) =
TestDirectory(MultiSource);
WriteFile $Prefix-multisourceprogramstable.txt,
$MultiSourceProgramsTable;
if ( ! $NOEXTERNALS ) {
if ( $VERBOSE ) {
print External TEST STAGE\n;
}
- ($ExternalProgramsTable, $externalsource_llcbeta_options) =
TestDirectory(External);
+ ($ExternalProgramsTable, llcbeta_options) = TestDirectory(External);
WriteFile $Prefix-externalprogramstable.txt, $ExternalProgramsTable;
system cat $Prefix-singlesourceprogramstable.txt
$Prefix-multisourceprogramstable.txt .
$Prefix-externalprogramstable.txt | sort $Prefix-Tests.txt;
@@ -1025,6 +1025,6 @@
#
##
system ( $NICE rm -rf $BuildDir) if (!$NOCHECKOUT and !$NOREMOVE);
-system ( $NICE rm -rf $WebDir) if (!$NOCHECKOUT and !$NOREMOVE and
!NOREMOVERESULTS);
+system ( $NICE rm -rf $WebDir) if (!$NOCHECKOUT and !$NOREMOVE and
!$NOREMOVERESULTS);
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.10 - 1.11
---
Log message:
Syntax error. I will run perl -c before commiting perl scripts.
---
Diffs of the changes: (+1 -1)
NewNightlyTest.pl |2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.10 llvm/utils/NewNightlyTest.pl:1.11
--- llvm/utils/NewNightlyTest.pl:1.10 Thu Jul 13 11:56:48 2006
+++ llvm/utils/NewNightlyTest.plThu Jul 13 11:58:42 2006
@@ -777,7 +777,7 @@
if ( $VERBOSE ) {
print External TEST STAGE\n;
}
- ($ExternalProgramsTable, llcbeta_options) = TestDirectory(External);
+ ($ExternalProgramsTable, $llcbeta_options) = TestDirectory(External);
WriteFile $Prefix-externalprogramstable.txt, $ExternalProgramsTable;
system cat $Prefix-singlesourceprogramstable.txt
$Prefix-multisourceprogramstable.txt .
$Prefix-externalprogramstable.txt | sort $Prefix-Tests.txt;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.8 - 1.9
---
Log message:
Fixed some output issues where newlines were not being printed after error
messages
---
Diffs of the changes: (+4 -3)
NewNightlyTest.pl |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.8 llvm/utils/NewNightlyTest.pl:1.9
--- llvm/utils/NewNightlyTest.pl:1.8Mon Jul 10 11:36:19 2006
+++ llvm/utils/NewNightlyTest.plMon Jul 10 13:35:41 2006
@@ -281,7 +281,7 @@
$/ = '\n';
return $Ret;
} else {
- print Could not open file '$_[0]' for reading!;
+ print Could not open file '$_[0]' for reading!\n;
return ;
}
}
@@ -289,7 +289,7 @@
#~
#~
sub WriteFile { # (filename, contents)
-open (FILE, $_[0]) or die Could not open file '$_[0]' for writing!;
+open (FILE, $_[0]) or die Could not open file '$_[0]' for writing!\n;
print FILE $_[1];
close FILE;
}
@@ -429,7 +429,8 @@
my $sentdata=;
foreach $x (keys (%$variables)){
-$sentdata.= $x = $hash_of_data{$x}\n;
+$value = $variables-{$x};
+$sentdata.= $x = $value\n;
}
WriteFile $Prefix-sentdata.txt, $sentdata;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.2 - 1.3
---
Log message:
Fixed variable naming issue that prevented $Prefix-senddata.txt from having any
information
---
Diffs of the changes: (+1 -1)
NewNightlyTest.pl |2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.2 llvm/utils/NewNightlyTest.pl:1.3
--- llvm/utils/NewNightlyTest.pl:1.2Thu Jul 6 17:32:15 2006
+++ llvm/utils/NewNightlyTest.plFri Jul 7 12:08:02 2006
@@ -441,7 +441,7 @@
my $sentdata=;
foreach $x(keys(%hash_of_data)){
-$senddata.= $x = $hash_of_data{$x}\n;
+$sentdata.= $x = $hash_of_data{$x}\n;
}
WriteFile $Prefix-sentdata.txt, $sentdata;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.3 - 1.4
---
Log message:
Added the -noremoveresults option which will not remove the $WebDir from the
nightly test runs.
---
Diffs of the changes: (+3 -0)
NewNightlyTest.pl |3 +++
1 files changed, 3 insertions(+)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.3 llvm/utils/NewNightlyTest.pl:1.4
--- llvm/utils/NewNightlyTest.pl:1.3Fri Jul 7 12:08:02 2006
+++ llvm/utils/NewNightlyTest.plFri Jul 7 12:31:38 2006
@@ -20,6 +20,7 @@
# -nocheckout Do not create, checkout, update, or configure
# the source tree.
# -noremoveDo not remove the BUILDDIR after it has been built.
+# -noremoveresults Do not remove the WEBDIR after it has been built.
# -nobuild Do not build llvm. If tests are enabled perform them
# on the llvm build specified in the build directory
# -notest Do not even attempt to run the test programs. Implies
@@ -119,6 +120,7 @@
if (/^-nocheckout$/) { $NOCHECKOUT = 1; next; }
if (/^-nocvsstats$/) { $NOCVSSTATS = 1; next; }
if (/^-noremove$/) { $NOREMOVE = 1; next; }
+if (/^-noremoveresults$/) { $NOREMOVERESULTS = 1; next; }
if (/^-notest$/) { $NOTEST = 1; $NORUNNINGTESTS = 1; next; }
if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
if (/^-parallel$/) { $MAKEOPTS = $MAKEOPTS -j2 -l3.0; next; }
@@ -1020,5 +1022,6 @@
#
##
system ( $NICE rm -rf $BuildDir) if (!$NOCHECKOUT and !$NOREMOVE);
+system ( $NICE rm -rf $WebDir) if (!$NOCHECKOUT and !$NOREMOVE and
!NOREMOVERESULTS);
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils: NewNightlyTest.pl updated: 1.4 - 1.5 --- Log message: Updated comments at top of file to reflect relevant command line options. --- Diffs of the changes: (+23 -10) NewNightlyTest.pl | 33 +++-- 1 files changed, 23 insertions(+), 10 deletions(-) Index: llvm/utils/NewNightlyTest.pl diff -u llvm/utils/NewNightlyTest.pl:1.4 llvm/utils/NewNightlyTest.pl:1.5 --- llvm/utils/NewNightlyTest.pl:1.4Fri Jul 7 12:31:38 2006 +++ llvm/utils/NewNightlyTest.plFri Jul 7 13:50:51 2006 @@ -27,9 +27,6 @@ # -norunningtests. # -norunningtests Do not run the Olden benchmark suite with # LARGE_PROBLEM_SIZE enabled. -# -noexternals Do not run the external tests (for cases where povray -# or SPEC are not installed) -# -with-externals Specify a directory where the external tests are located. # -nodejagnu Do not run feature or regression tests # -parallelRun two parallel jobs with GNU Make. # -release Build an LLVM Release version @@ -54,14 +51,15 @@ # override the default. # -ldflags Next argument specifies that linker options that override # the default. -# -extraflags Next argument specifies extra options that are passed to -# compile the tests. +# -compileflagsNext argument specifies extra options passed to make when +# building LLVM. # # Options to configure llvm-test -# -spec2000pathPath to the benchspec directory in the SPEC 2000 distro -# -spec95path Path to the benchspec directory in the SPEC 95 distro. -# -povraypath Path to the povray sources -# -namdpathPath to the namd sources +# -extraflags Next argument specifies extra options that are passed to +# compile the tests. +# -noexternals Do not run the external tests (for cases where povray +# or SPEC are not installed) +# -with-externals Specify a directory where the external tests are located. # # CVSROOT is the CVS repository from which the tree will be checked out, # specified either in the full :method:[EMAIL PROTECTED]:/dir syntax, or @@ -451,6 +449,12 @@ return $result; } +## +# +# Getting Start timestamp +# +## +$starttime = `date`; ## # @@ -912,6 +916,13 @@ #AddRecord($BytecodeSize, running_Olden_bytecode.txt, $WebDir); } +## +# +# Getting end timestamp +# +## +$endtime = `date`; + ## # @@ -1001,7 +1012,9 @@ 'removed_tests' = $TestsRemoved, 'unexpfail_tests' = $unexpfail_tests, 'dejagnutests_log' = $dejagnutests_log, - 'dejagnutests_sum' = $dejagnutests_sum); + 'dejagnutests_sum' = $dejagnutests_sum + 'starttime' = $starttime, + 'endtime' = $endtime); $TESTING = 0; ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.5 - 1.6
---
Log message:
Fixed a variable naming issue for the External Program Results table. Also
fixed an issue with printing the sent data to a sentdata.txt
---
Diffs of the changes: (+3 -15)
NewNightlyTest.pl | 18 +++---
1 files changed, 3 insertions(+), 15 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.5 llvm/utils/NewNightlyTest.pl:1.6
--- llvm/utils/NewNightlyTest.pl:1.5Fri Jul 7 13:50:51 2006
+++ llvm/utils/NewNightlyTest.plFri Jul 7 16:40:34 2006
@@ -161,18 +161,6 @@
if (/^-noexternals$/){ $NOEXTERNALS = 1; next; }
if (/^-nodejagnu$/) { $NODEJAGNU = 1; next; }
if (/^-nobuild$/){ $NOBUILD = 1; next; }
-if (/^-spec2000path$/) {
- $LLVMTESTCONFIGARGS .= --enable-spec2000=$ARGV[0]; shift; next;
-} else{ $LLVMTESTCONFIGARGS=; }
-if (/^-spec95path$/) {
- $LLVMTESTCONFIGARGS .= --enable-spec95=$ARGV[0]; shift; next;
-}
-if (/^-povraypath$/) {
- $LLVMTESTCONFIGARGS .= --enable-povray=$ARGV[0]; shift; next;
-}
-if (/^-namdpath$/) {
- $LLVMTESTCONFIGARGS .= --enable-namd=$ARGV[0]; shift; next;
-}
print Unknown option: $_ : ignoring!\n;
}
@@ -440,11 +428,11 @@
close(SOCK);
my $sentdata=;
-foreach $x(keys(%hash_of_data)){
+foreach $x (keys (%$variables)){
$sentdata.= $x = $hash_of_data{$x}\n;
}
WriteFile $Prefix-sentdata.txt, $sentdata;
-
+
return $result;
}
@@ -1002,7 +990,7 @@
'buildstatus' = $BuildStatus,
'singlesource_programstable' = $SingleSourceProgramsTable,
'multisource_programstable' = $MultiSourceProgramsTable,
- 'externalsource_programstable' = $ExternalSourceProgramsTable,
+ 'externalsource_programstable' = $ExternalProgramsTable,
'llcbeta_options' = $multisource_llcbeta_options,
'warnings_removed' = $WarningsRemoved,
'warnings_added' = $WarningsAdded,
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils: NewNightlyTest.pl updated: 1.6 - 1.7 --- Log message: Syntax error in NewNightlyTest.pl --- Diffs of the changes: (+1 -1) NewNightlyTest.pl |2 +- 1 files changed, 1 insertion(+), 1 deletion(-) Index: llvm/utils/NewNightlyTest.pl diff -u llvm/utils/NewNightlyTest.pl:1.6 llvm/utils/NewNightlyTest.pl:1.7 --- llvm/utils/NewNightlyTest.pl:1.6Fri Jul 7 16:40:34 2006 +++ llvm/utils/NewNightlyTest.plFri Jul 7 16:47:24 2006 @@ -1000,7 +1000,7 @@ 'removed_tests' = $TestsRemoved, 'unexpfail_tests' = $unexpfail_tests, 'dejagnutests_log' = $dejagnutests_log, - 'dejagnutests_sum' = $dejagnutests_sum + 'dejagnutests_sum' = $dejagnutests_sum, 'starttime' = $starttime, 'endtime' = $endtime); ___ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils: NewNightlyTest.pl added (r1.1) --- Log message: The first commit of NewNightlyTest.pl which instead of generating a webpage submits the results of the test to a central server for storage and display. --- Diffs of the changes: (+1024 -0) NewNightlyTest.pl | 1024 ++ 1 files changed, 1024 insertions(+) Index: llvm/utils/NewNightlyTest.pl diff -c /dev/null llvm/utils/NewNightlyTest.pl:1.1 *** /dev/null Thu Jul 6 16:19:42 2006 --- llvm/utils/NewNightlyTest.plThu Jul 6 16:19:32 2006 *** *** 0 --- 1,1024 + #!/usr/bin/perl + + use POSIX qw(strftime); + use File::Copy; + use Socket; + + # + # Program: NewNightlyTest.pl + # + # Synopsis: Perform a series of tests which are designed to be run nightly. + # This is used to keep track of the status of the LLVM tree, tracking + # regressions and performance changes. Submits this information + # to llvm.org where it is placed into the nightlytestresults database. + # + # Modified heavily by Patrick Jenkins, July 2006 + # + # Syntax: NightlyTest.pl [OPTIONS] [CVSROOT BUILDDIR WEBDIR] + # where + # OPTIONS may include one or more of the following: + # -nocheckout Do not create, checkout, update, or configure + # the source tree. + # -noremoveDo not remove the BUILDDIR after it has been built. + # -nobuild Do not build llvm. If tests are enabled perform them + # on the llvm build specified in the build directory + # -notest Do not even attempt to run the test programs. Implies + # -norunningtests. + # -norunningtests Do not run the Olden benchmark suite with + # LARGE_PROBLEM_SIZE enabled. + # -noexternals Do not run the external tests (for cases where povray + # or SPEC are not installed) + # -with-externals Specify a directory where the external tests are located. + # -nodejagnu Do not run feature or regression tests + # -parallelRun two parallel jobs with GNU Make. + # -release Build an LLVM Release version + # -enable-llcbeta Enable testing of beta features in llc. + # -disable-llc Disable LLC tests in the nightly tester. + # -disable-jit Disable JIT tests in the nightly tester. + # -disable-cbe Disable C backend tests in the nightly tester. + # -verbose Turn on some debug output + # -debug Print information useful only to maintainers of this script. + # -niceCheckout/Configure/Build with nice to reduce impact + # on busy servers. + # -f2c Next argument specifies path to F2C utility + # -nicknameThe next argument specifieds the nickname this script + # will submit to the nightlytest results repository. + # -gccpath Path to gcc/g++ used to build LLVM + # -cvstag Check out a specific CVS tag to build LLVM (useful for + # testing release branches) + # -target Specify the target triplet + # -cflags Next argument specifies that C compilation options that + # override the default. + # -cxxflagsNext argument specifies that C++ compilation options that + # override the default. + # -ldflags Next argument specifies that linker options that override + # the default. + # -extraflags Next argument specifies extra options that are passed to + # compile the tests. + # + # Options to configure llvm-test + # -spec2000pathPath to the benchspec directory in the SPEC 2000 distro + # -spec95path Path to the benchspec directory in the SPEC 95 distro. + # -povraypath Path to the povray sources + # -namdpathPath to the namd sources + # + # CVSROOT is the CVS repository from which the tree will be checked out, + # specified either in the full :method:[EMAIL PROTECTED]:/dir syntax, or + # just /dir if using a local repo. + # BUILDDIR is the directory where sources for this test run will be checked out + # AND objects for this test run will be built. This directory MUST NOT + # exist before the script is run; it will be created by the cvs checkout + # process and erased (unless -noremove is specified; see above.) + # WEBDIR is the directory into which the test results web page will be written, + # AND in which the index.html is assumed to be a symlink to the most recent + # copy of the results. This directory will be created if it does not exist. + # LLVMGCCDIR is the directory in which the LLVM GCC Front End is installed + # to. This is the same as you would have for a normal LLVM build. + # + ## + # + # Getting environment variables + # +
[llvm-commits] CVS: llvm/utils/NewNightlyTest.pl
Changes in directory llvm/utils:
NewNightlyTest.pl updated: 1.1 - 1.2
---
Log message:
Fixed a bug that looked for -Warnings.txt and -Tests.txt in ridiculous places.
---
Diffs of the changes: (+2 -2)
NewNightlyTest.pl |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: llvm/utils/NewNightlyTest.pl
diff -u llvm/utils/NewNightlyTest.pl:1.1 llvm/utils/NewNightlyTest.pl:1.2
--- llvm/utils/NewNightlyTest.pl:1.1Thu Jul 6 16:19:32 2006
+++ llvm/utils/NewNightlyTest.plThu Jul 6 17:32:15 2006
@@ -697,7 +697,7 @@
# Emit the warnings file, so we can diff...
WriteFile $WebDir/$DATE-Warnings.txt, $WarningsFile . \n;
-my ($WarningsAdded, $WarningsRemoved) = DiffFiles $Prefix-Warnings.txt;
+my ($WarningsAdded, $WarningsRemoved) = DiffFiles -Warnings.txt;
# Output something to stdout if something has changed
#print ADDED WARNINGS:\n$WarningsAdded\n\n if (length $WarningsAdded);
@@ -812,7 +812,7 @@
$TestsFixed = berror testing/bbr;
$TestsBroken = berror testing/bbr;
} else {
-my ($RTestsAdded, $RTestsRemoved) = DiffFiles $Prefix-Tests.txt;
+my ($RTestsAdded, $RTestsRemoved) = DiffFiles -Tests.txt;
my @RawTestsAddedArray = split '\n', $RTestsAdded;
my @RawTestsRemovedArray = split '\n', $RTestsRemoved;
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
