Add a new -compileflags options, remove old externals location specifiers.

People should just use -with-externals.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28756 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2006-06-12 19:03:17 +00:00
parent a3bb86dd6b
commit f6dc20fcc0

View File

@ -17,9 +17,6 @@
# -norunningtests. # -norunningtests.
# -norunningtests Do not run the Olden benchmark suite with # -norunningtests Do not run the Olden benchmark suite with
# LARGE_PROBLEM_SIZE enabled. # 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 # -nodejagnu Do not run feature or regression tests
# -parallel Run two parallel jobs with GNU Make. # -parallel Run two parallel jobs with GNU Make.
# -release Build an LLVM Release version # -release Build an LLVM Release version
@ -43,14 +40,15 @@
# override the default. # override the default.
# -ldflags Next argument specifies that linker options that override # -ldflags Next argument specifies that linker options that override
# the default. # the default.
# -extraflags Next argument specifies extra options that are passed to # -compileflags Next argument specifies extra options passed to make when
# compile the tests. # building LLVM.
# #
# ---------------- Options to configure llvm-test ---------------------------- # ---------------- Options to configure llvm-test ----------------------------
# -spec2000path Path to the benchspec directory in the SPEC 2000 distro # -extraflags Next argument specifies extra options that are passed to
# -spec95path Path to the benchspec directory in the SPEC 95 distro. # compile the tests.
# -povraypath Path to the povray sources # -noexternals Do not run the external tests (for cases where povray
# -namdpath Path to the namd sources # 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, # CVSROOT is the CVS repository from which the tree will be checked out,
# specified either in the full :method:user@host:/dir syntax, or # specified either in the full :method:user@host:/dir syntax, or
@ -100,8 +98,6 @@ my $CVSCOOPT = "-APR";
my $NICE = ""; my $NICE = "";
my $NODEJAGNU = 0; my $NODEJAGNU = 0;
my $LLVMTESTCONFIGARGS = "";
sub ReadFile { sub ReadFile {
if (open (FILE, $_[0])) { if (open (FILE, $_[0])) {
undef $/; undef $/;
@ -334,23 +330,14 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
if (/^-ldflags/) { if (/^-ldflags/) {
$MAKEOPTS = "$MAKEOPTS LD.Flags=\'$ARGV[0]\'"; shift; next; $MAKEOPTS = "$MAKEOPTS LD.Flags=\'$ARGV[0]\'"; shift; next;
} }
if (/^-extraflags/) { if (/^-compileflags/) {
$MAKEOPTS = "$MAKEOPTS $ARGV[0]"; shift; next;
}
if (/^-extraflags/) {
$PROGTESTOPTS .= " EXTRA_FLAGS=\'$ARGV[0]\'"; shift; next; $PROGTESTOPTS .= " EXTRA_FLAGS=\'$ARGV[0]\'"; shift; next;
} }
if (/^-noexternals$/) { $NOEXTERNALS = 1; next; } if (/^-noexternals$/) { $NOEXTERNALS = 1; next; }
if (/^-nodejagnu$/) { $NODEJAGNU = 1; next; } if (/^-nodejagnu$/) { $NODEJAGNU = 1; next; }
if (/^-spec2000path$/) {
$LLVMTESTCONFIGARGS .= " --enable-spec2000=$ARGV[0]"; shift; next;
}
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"; print "Unknown option: $_ : ignoring!\n";
} }
@ -462,7 +449,7 @@ $LOC = `utils/countloc.sh`;
# #
if (!$NOCHECKOUT) { if (!$NOCHECKOUT) {
if ( $VERBOSE ) { print "CONFIGURE STAGE\n"; } if ( $VERBOSE ) { print "CONFIGURE STAGE\n"; }
my $EXTRAFLAGS = "--enable-spec --with-objroot=.$LLVMTESTCONFIGARGS"; my $EXTRAFLAGS = "--enable-spec --with-objroot=.";
system "(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) > $BuildLog 2>&1"; system "(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) > $BuildLog 2>&1";
if ( $VERBOSE ) { print "BUILD STAGE\n"; } if ( $VERBOSE ) { print "BUILD STAGE\n"; }