[llvm-commits] Various improvements to NewNightlyTest.pl

[Tanya Lattner]

On Jun 9, 2009, at 4:56 PM, Edward O'Callaghan wrote:

> Good day,
>
> Just a few improvements to our Nightly scripts so that they:
>
> * Clean up before each build when not doing a purge of the old  
> checkin.
> * Add -disable-pic option for building (needs more testing)
> * Add clang nightly checkin and testing support.
>
> Just my two cent, let me know what you think..
>
> -bash-3.2$ diff -u NewNightlyTest.pl_old NewNightlyTest.pl
> --- NewNightlyTest.pl_old       Fri Jun  5 00:19:52 2009
> +++ NewNightlyTest.pl   Fri Jun  5 13:52:52 2009
> -12,6 +12,7 @@
> #           to llvm.org where it is placed into the
> nightlytestresults database.
> #

>
> # Modified heavily by Patrick Jenkins, July 2006
> +# Advanced by Edward O'Callaghan, Jun 2009
> #

Please remove both lines here and add yourself to the CREDITS.txt. We  
no longer put credits in individual files (somehow this did not get  
removed during the switch).

Thanks,
Tanya


>
> # Syntax:   NightlyTest.pl [OPTIONS] [CVSROOT BUILDDIR WEBDIR]
> #   where
> -26,10 +27,12 @@
> #  -nodejagnu       Do not run feature or regression tests
> #  -parallel        Run parallel jobs with GNU Make (see -parallel- 
> jobs).
> #  -parallel-jobs   The number of parallel Make jobs to use (default  
> is two).
> +#  -with-clang      Checkout Clang source into tools/clang.
> #  -release         Build an LLVM Release version
> #  -release-asserts Build an LLVM ReleaseAsserts version
> #  -enable-llcbeta  Enable testing of beta features in llc.
> #  -enable-lli      Enable testing of lli (interpreter) features,
> default is off
> +#  -disable-pic            Disable building with Position  
> Independent Code.
> #  -disable-llc     Disable LLC tests in the nightly tester.
> #  -disable-jit     Disable JIT tests in the nightly tester.
> #  -disable-cbe     Disable C backend tests in the nightly tester.
> -98,7 +101,7 @@
> ##############################################################
> my $HOME       = $ENV{'HOME'};
> my $SVNURL     = $ENV{"SVNURL"};
> -$SVNURL        = 'https://llvm.org/svn/llvm-project' unless $SVNURL;
> +$SVNURL        = 'http://llvm.org/svn/llvm-project' unless $SVNURL;
> my $CVSRootDir = $ENV{'CVSROOT'};
> $CVSRootDir    = "/home/vadve/shared/PublicCVS" unless $CVSRootDir;
> my $BuildDir   = $ENV{'BUILDDIR'};
> -145,6 +148,7 @@
>   if (/^-norunningtests$/) { next; } # Backward compatibility,  
> ignored.
>   if (/^-parallel-jobs$/)  { $PARALLELJOBS = "$ARGV[0]"; shift; next;}
>   if (/^-parallel$/)       { $MAKEOPTS = "$MAKEOPTS -j$PARALLELJOBS
> -l3.0"; next; }
> +  if (/^-with-clang$/)     { $WITHCLANG = 1; next; }
>   if (/^-release$/)        { $MAKEOPTS = "$MAKEOPTS  
> ENABLE_OPTIMIZED=1 ".
>                              "OPTIMIZE_OPTION=-O2";
> $BUILDTYPE="release"; next;}
>   if (/^-release-asserts$/){ $MAKEOPTS = "$MAKEOPTS  
> ENABLE_OPTIMIZED=1 ".
> -152,6 +156,7 @@
>                              "OPTIMIZE_OPTION=-O2";
>                              $BUILDTYPE="release-asserts"; next;}
>   if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= " ENABLE_LLCBETA=1";  
> next; }
> +  if (/^-disable-pic$/)    { $CONFIGUREARGS .= " --enable-pic=no";  
> next; }
>   if (/^-enable-lli$/)     { $PROGTESTOPTS .= " ENABLE_LLI=1";
>                              $CONFIGUREARGS .= " --enable-lli";  
> next; }
>   if (/^-disable-llc$/)    { $PROGTESTOPTS .= " DISABLE_LLC=1";
> -534,13 +539,20 @@
> if (!$NOCHECKOUT) {
>   if ( $VERBOSE ) { print "CHECKOUT STAGE:\n"; }
>   if ($USESVN) {
> -    my $SVNCMD = "$NICE svn co $SVNURL";
> -    if ($VERBOSE) {
> -      print "( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ;  
> " .
> +      my $SVNCMD = "$NICE svn co --non-interactive $SVNURL";
> +      if ($VERBOSE) {
> +        print "( time -p $SVNCMD/llvm/trunk llvm; cd llvm/ 
> projects ; " .
> +              "$SVNCMD/test-suite/trunk llvm-test ) > $COLog 2>&1\n";
> +      }
> +      system "( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ;  
> " .
>             "$SVNCMD/test-suite/trunk llvm-test ) > $COLog 2>&1\n";
> -    }
> -    system "( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; " .
> -          "$SVNCMD/test-suite/trunk llvm-test ) > $COLog 2>&1\n";
> +       if ($WITHCLANG) {
> +         my $SVNCMD = "$NICE svn co --non-interactive $SVNURL/cfe/ 
> trunk";
> +         if ($VERBOSE) {
> +          print "( time -p cd llvm/tools ; $SVNCMD clang ) > $COLog  
> 2>&1\n";
> +       }
> +       system "( time -p cd llvm/tools ; $SVNCMD clang ) > $COLog  
> 2>&1\n";
> +       }
>   } else {
>     my $CVSOPT = "";
>     $CVSOPT = "-z3" # Use compression if going over ssh.
> -611,7 +623,7 @@
>   if ($VERBOSE) { print "CHANGE HISTORY ANALYSIS STAGE\n"; }
>
>   if ($USESVN) {
> -    @SVNHistory = split /<logentry/, `svn log --xml --verbose - 
> r{$DATE}:HEAD`;
> +    @SVNHistory = split /<logentry/, `svn log --non-interactive --xml
> --verbose -r{$DATE}:HEAD`;
>     # Skip very first entry because it is the XML header cruft
>     shift @SVNHistory;
>     my $Now = time();
> -717,9 +729,11 @@
>          "> $BuildLog 2>&1";
>   if ( $VERBOSE ) {
>     print "BUILD STAGE:\n";
> +    print "(time -p $NICE $MAKECMD clean) >> $BuildLog 2>&1\n";
>     print "(time -p $NICE $MAKECMD $MAKEOPTS) >> $BuildLog 2>&1\n";
>   }
>   # Build the entire tree, capturing the output into $BuildLog
> +  system "(time -p $NICE $MAKECMD clean) >> $BuildLog 2>&1";
>   system "(time -p $NICE $MAKECMD $MAKEOPTS) >> $BuildLog 2>&1";
> }
>
> Cheers,
> Edward.
>
> -- 
> -- 
> Edward O'Callaghan
> http://www.auroraux.org/
> eocallaghan at auroraux dot org
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20090610/727f126f/attachment.html>