[llvm-commits] CVS: llvm/utils/NightlyTest.pl

[Brian Gaeke]

Changes in directory llvm/utils:

NightlyTest.pl updated: 1.49 -> 1.50

---
Log message:

Allow script to set configure args.
Allow environment to set llvmgccdir.


---
Diffs of the changes:  (+10 -3)

Index: llvm/utils/NightlyTest.pl
diff -u llvm/utils/NightlyTest.pl:1.49 llvm/utils/NightlyTest.pl:1.50
--- llvm/utils/NightlyTest.pl:1.49	Wed Jun  2 22:29:39 2004
+++ llvm/utils/NightlyTest.pl	Thu Jun  3 16:46:56 2004
@@ -133,8 +133,9 @@
 my $PROGTESTOPTS = "";
 my $VERBOSE  = 0;
 my $DEBUG = 0;
+my $CONFIGUREARGS = "--enable-jit";
 
-# Parse arguments...
+# Parse arguments... 
 while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
   shift;
   last if /^--$/;  # Stop processing arguments on --
@@ -148,13 +149,19 @@
   if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
   if (/^-parallel$/)       { $MAKEOPTS   = "-j2 -l3.0"; next; }
   if (/^-enable-linscan$/) { $PROGTESTOPTS .= " ENABLE_LINEARSCAN=1"; next; }
-  if (/^-disable-codegen$/){ $PROGTESTOPTS .= " DISABLE_JIT=1 DISABLE_LLC=1"; next; }
+  if (/^-disable-codegen$/){ $PROGTESTOPTS .= " DISABLE_JIT=1 DISABLE_LLC=1";
+                             $CONFIGUREARGS="--disable-jit --disable-llc_diffs";
+                             next; }
   if (/^-verbose$/)        { $VERBOSE  = 1; next; }
   if (/^-debug$/)          { $DEBUG  = 1; next; }
 
   print "Unknown option: $_ : ignoring!\n";
 }
 
+if ($ENV{'LLVMGCCDIR'}) {
+  $CONFIGUREARGS .= " --with-llvmgccdir=" . $ENV{'LLVMGCCDIR'};
+}
+
 die "Must specify 0 or 3 options!" if (@ARGV != 0 and @ARGV != 3);
 
 if (@ARGV == 3) {
@@ -226,7 +233,7 @@
 #
 if (!$NOCHECKOUT) {
   if ( $VERBOSE ) { print "CONFIGURE STAGE\n"; }
-  system "(time -p ./configure --enable-jit --enable-spec --with-objroot=.) > $Prefix-Build-Log.txt 2>&1";
+  system "(time -p ./configure $CONFIGUREARGS --enable-spec --with-objroot=.) > $Prefix-Build-Log.txt 2>&1";
 
   if ( $VERBOSE ) { print "BUILD STAGE\n"; }
   # Build the entire tree, capturing the output into $Prefix-Build-Log.txt