diff options
| author | Patrick Jenkins <pjenkins@apple.com> | 2006-07-17 16:41:19 +0000 |
|---|---|---|
| committer | Patrick Jenkins <pjenkins@apple.com> | 2006-07-17 16:41:19 +0000 |
| commit | adea55e3a52f385f2b2f4289dd9704eca7e9b1cd (patch) | |
| tree | df522207e139f4c1cbdeaf95a61b69ddd675fe34 | |
| parent | fb878a37ba2162df65519735ccd288a3a721446e (diff) | |
| download | external_llvm-adea55e3a52f385f2b2f4289dd9704eca7e9b1cd.zip external_llvm-adea55e3a52f385f2b2f4289dd9704eca7e9b1cd.tar.gz external_llvm-adea55e3a52f385f2b2f4289dd9704eca7e9b1cd.tar.bz2 | |
If a gccpath is specified when invoking the nightly test script we will hopefully now use that gcc for the gcc version. Also fixed some 80 char column stuff.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29162 91177308-0d34-0410-b5e6-96231b3b80d8
| -rwxr-xr-x | utils/NewNightlyTest.pl | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/utils/NewNightlyTest.pl b/utils/NewNightlyTest.pl index 6eabad1..bf404ef 100755 --- a/utils/NewNightlyTest.pl +++ b/utils/NewNightlyTest.pl @@ -122,7 +122,8 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) { 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"; next; } + if (/^-release$/) { $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1 ". + "OPTIMIZE_OPTION=-O2"; next; } if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= " ENABLE_LLCBETA=1"; next; } if (/^-disable-llc$/) { $PROGTESTOPTS .= " DISABLE_LLC=1"; $CONFIGUREARGS .= " --disable-llc_diffs"; next; } @@ -138,11 +139,13 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) { $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++"; + 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 (/^-cvstag/) { $CVSCOOPT .= " -r $ARGV[0]"; shift; next; } + else{ $CVSCOOPT="";} if (/^-target/) { $CONFIGUREARGS .= " --target=$ARGV[0]"; shift; next; } @@ -404,7 +407,8 @@ sub SendData{ $port=80; $socketaddr= sockaddr_in $port, inet_aton $host or die "Bad hostname\n"; - socket SOCK, PF_INET, SOCK_STREAM, getprotobyname('tcp') or die "Bad socket\n"; + socket SOCK, PF_INET, SOCK_STREAM, getprotobyname('tcp') or + die "Bad socket\n"; connect SOCK, $socketaddr or die "Bad connection\n"; select((select(SOCK), $| = 1)[0]); @@ -957,7 +961,7 @@ my $dejagnulog_full; $dejagnulog_full = join("\n", @DEJAGNULOG_FULL); if($GCCPATH){ - my $gcc_version_long = `$ARGV[0]/gcc --version`; + my $gcc_version_long = `$GCCPATH/gcc --version`; } else{ my $gcc_version_long = `gcc --version`; |