Skip to content

Commit 1deb86d

Browse files
committed
Let people who run the nightly tester specify paths to external tests, instead
of having to hack the nightly tester script itself. as an example, I use the following for my machine: $HOME/llvm/utils/NightlyTest.pl -parallel -release -enable-llcbeta \ -spec2000path /Volumes/ProjectsDisk/cvs/benchmarks/speccpu2000-llvm/benchspec/ \ -povraypath /Volumes/ProjectsDisk/cvs/benchmarks/povray31 \ -namdpath /Volumes/ProjectsDisk/cvs/benchmarks/namd llvm-svn: 24136
1 parent 5a087ff commit 1deb86d

File tree

1 file changed

+21
-2
lines changed

1 file changed

+21
-2
lines changed

llvm/utils/NightlyTest.pl

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@
3838
# testing release branches)
3939
# -target Specify the target triplet
4040
#
41+
# ---------------- Options to configure llvm-test ----------------------------
42+
# -spec2000path Path to the benchspec directory in the SPEC 2000 distro
43+
# -spec95path Path to the benchspec directory in the SPEC 95 distro.
44+
# -povraypath Path to the povray sources
45+
# -namdpath Path to the namd sources
46+
#
4147
# CVSROOT is the CVS repository from which the tree will be checked out,
4248
# specified either in the full :method:user@host:/dir syntax, or
4349
# just /dir if using a local repo.
@@ -86,6 +92,8 @@
8692
my $NICE = "";
8793
my $NODEJAGNU = 0;
8894

95+
my $LLVMTESTCONFIGARGS = "";
96+
8997
sub ReadFile {
9098
if (open (FILE, $_[0])) {
9199
undef $/;
@@ -298,7 +306,18 @@ sub GetDejagnuTestResults { # (filename, log)
298306
}
299307
if (/^-noexternals$/) { $NOEXTERNALS = 1; next; }
300308
if (/^-nodejagnu$/) { $NODEJAGNU = 1; next; }
301-
309+
if (/^-spec2000path$/) {
310+
$LLVMTESTCONFIGARGS .= " --enable-spec2000=$ARGV[0]"; shift; next;
311+
}
312+
if (/^-spec95path$/) {
313+
$LLVMTESTCONFIGARGS .= " --enable-spec95=$ARGV[0]"; shift; next;
314+
}
315+
if (/^-povraypath$/) {
316+
$LLVMTESTCONFIGARGS .= " --enable-povray=$ARGV[0]"; shift; next;
317+
}
318+
if (/^-namdpath$/) {
319+
$LLVMTESTCONFIGARGS .= " --enable-namd=$ARGV[0]"; shift; next;
320+
}
302321
print "Unknown option: $_ : ignoring!\n";
303322
}
304323

@@ -410,7 +429,7 @@ sub GetDejagnuTestResults { # (filename, log)
410429
#
411430
if (!$NOCHECKOUT) {
412431
if ( $VERBOSE ) { print "CONFIGURE STAGE\n"; }
413-
my $EXTRAFLAGS = "--enable-spec --with-objroot=.";
432+
my $EXTRAFLAGS = "--enable-spec --with-objroot=.$LLVMTESTCONFIGARGS";
414433
system "(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) > $BuildLog 2>&1";
415434

416435
if ( $VERBOSE ) { print "BUILD STAGE\n"; }

0 commit comments

Comments
 (0)