<html><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; "><br><div><div>On Jun 9, 2009, at 4:56 PM, Edward O'Callaghan wrote:</div><br class="Apple-interchange-newline"><blockquote type="cite"><div>Good day,<br><br>Just a few improvements to our Nightly scripts so that they:<br><br>* Clean up before each build when not doing a purge of the old checkin.<br>* Add -disable-pic option for building (needs more testing)<br>* Add clang nightly checkin and testing support.<br><br>Just my two cent, let me know what you think..<br><br>-bash-3.2$ diff -u NewNightlyTest.pl_old NewNightlyTest.pl<br>--- NewNightlyTest.pl_old Fri Jun 5 00:19:52 2009<br>+++ NewNightlyTest.pl Fri Jun 5 13:52:52 2009<br> -12,6 +12,7 @@<br> # to llvm.org where it is placed into the<br>nightlytestresults database.<br> #</div></blockquote><br><blockquote type="cite"><div><br> # Modified heavily by Patrick Jenkins, July 2006<br>+# Advanced by Edward O'Callaghan, Jun 2009<br> #</div></blockquote><div><br></div><div>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).</div><div><br></div><div>Thanks,</div><div>Tanya</div><div><br></div><br><blockquote type="cite"><div><br> # Syntax: NightlyTest.pl [OPTIONS] [CVSROOT BUILDDIR WEBDIR]<br> # where<br> -26,10 +27,12 @@<br> # -nodejagnu Do not run feature or regression tests<br> # -parallel Run parallel jobs with GNU Make (see -parallel-jobs).<br> # -parallel-jobs The number of parallel Make jobs to use (default is two).<br>+# -with-clang Checkout Clang source into tools/clang.<br> # -release Build an LLVM Release version<br> # -release-asserts Build an LLVM ReleaseAsserts version<br> # -enable-llcbeta Enable testing of beta features in llc.<br> # -enable-lli Enable testing of lli (interpreter) features,<br>default is off<br>+# -disable-pic Disable building with Position Independent Code.<br> # -disable-llc Disable LLC tests in the nightly tester.<br> # -disable-jit Disable JIT tests in the nightly tester.<br> # -disable-cbe Disable C backend tests in the nightly tester.<br> -98,7 +101,7 @@<br> ##############################################################<br> my $HOME = $ENV{'HOME'};<br> my $SVNURL = $ENV{"SVNURL"};<br>-$SVNURL = '<a href="https://llvm.org/svn/llvm-project'">https://llvm.org/svn/llvm-project'</a> unless $SVNURL;<br>+$SVNURL = '<a href="http://llvm.org/svn/llvm-project'">http://llvm.org/svn/llvm-project'</a> unless $SVNURL;<br> my $CVSRootDir = $ENV{'CVSROOT'};<br> $CVSRootDir = "/home/vadve/shared/PublicCVS" unless $CVSRootDir;<br> my $BuildDir = $ENV{'BUILDDIR'};<br> -145,6 +148,7 @@<br> if (/^-norunningtests$/) { next; } # Backward compatibility, ignored.<br> if (/^-parallel-jobs$/) { $PARALLELJOBS = "$ARGV[0]"; shift; next;}<br> if (/^-parallel$/) { $MAKEOPTS = "$MAKEOPTS -j$PARALLELJOBS<br>-l3.0"; next; }<br>+ if (/^-with-clang$/) { $WITHCLANG = 1; next; }<br> if (/^-release$/) { $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1 ".<br> "OPTIMIZE_OPTION=-O2";<br>$BUILDTYPE="release"; next;}<br> if (/^-release-asserts$/){ $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1 ".<br> -152,6 +156,7 @@<br> "OPTIMIZE_OPTION=-O2";<br> $BUILDTYPE="release-asserts"; next;}<br> if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= " ENABLE_LLCBETA=1"; next; }<br>+ if (/^-disable-pic$/) { $CONFIGUREARGS .= " --enable-pic=no"; next; }<br> if (/^-enable-lli$/) { $PROGTESTOPTS .= " ENABLE_LLI=1";<br> $CONFIGUREARGS .= " --enable-lli"; next; }<br> if (/^-disable-llc$/) { $PROGTESTOPTS .= " DISABLE_LLC=1";<br> -534,13 +539,20 @@<br> if (!$NOCHECKOUT) {<br> if ( $VERBOSE ) { print "CHECKOUT STAGE:\n"; }<br> if ($USESVN) {<br>- my $SVNCMD = "$NICE svn co $SVNURL";<br>- if ($VERBOSE) {<br>- print "( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; " .<br>+ my $SVNCMD = "$NICE svn co --non-interactive $SVNURL";<br>+ if ($VERBOSE) {<br>+ print "( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; " .<br>+ "$SVNCMD/test-suite/trunk llvm-test ) > $COLog 2>&1\n";<br>+ }<br>+ system "( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; " .<br> "$SVNCMD/test-suite/trunk llvm-test ) > $COLog 2>&1\n";<br>- }<br>- system "( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; " .<br>- "$SVNCMD/test-suite/trunk llvm-test ) > $COLog 2>&1\n";<br>+ if ($WITHCLANG) {<br>+ my $SVNCMD = "$NICE svn co --non-interactive $SVNURL/cfe/trunk";<br>+ if ($VERBOSE) {<br>+ print "( time -p cd llvm/tools ; $SVNCMD clang ) > $COLog 2>&1\n";<br>+ }<br>+ system "( time -p cd llvm/tools ; $SVNCMD clang ) > $COLog 2>&1\n";<br>+ }<br> } else {<br> my $CVSOPT = "";<br> $CVSOPT = "-z3" # Use compression if going over ssh.<br> -611,7 +623,7 @@<br> if ($VERBOSE) { print "CHANGE HISTORY ANALYSIS STAGE\n"; }<br><br> if ($USESVN) {<br>- @SVNHistory = split /<logentry/, `svn log --xml --verbose -r{$DATE}:HEAD`;<br>+ @SVNHistory = split /<logentry/, `svn log --non-interactive --xml<br>--verbose -r{$DATE}:HEAD`;<br> # Skip very first entry because it is the XML header cruft<br> shift @SVNHistory;<br> my $Now = time();<br> -717,9 +729,11 @@<br> "> $BuildLog 2>&1";<br> if ( $VERBOSE ) {<br> print "BUILD STAGE:\n";<br>+ print "(time -p $NICE $MAKECMD clean) >> $BuildLog 2>&1\n";<br> print "(time -p $NICE $MAKECMD $MAKEOPTS) >> $BuildLog 2>&1\n";<br> }<br> # Build the entire tree, capturing the output into $BuildLog<br>+ system "(time -p $NICE $MAKECMD clean) >> $BuildLog 2>&1";<br> system "(time -p $NICE $MAKECMD $MAKEOPTS) >> $BuildLog 2>&1";<br> }<br><br>Cheers,<br>Edward.<br><br>-- <br>-- <br>Edward O'Callaghan<br><a href="http://www.auroraux.org/">http://www.auroraux.org/</a><br>eocallaghan at auroraux dot org<br>_______________________________________________<br>llvm-commits mailing list<br><a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits<br></div></blockquote></div><br></body></html>