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

[Patrick Jenkins]

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.pl	Fri 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];