- Added support for the variable ABT_JOBS, number of jobs to run in parallel.

- Added support for the variable ABT_RUN_REGTEST, the command to run the regression tests.
- Added support for the variable ABT_CONFIGURE_OPTIONS, such that extra command line options
  can be passed to the configure script.
- Cross-compilation patch is applied after source code checkout and before the source code is
  compiled.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8588 a5019735-40e9-0310-863c-91ae7b9d1cf9

1 files changed, 10 insertions, 4 deletions

diff --git a/nightly/bin/nightly b/nightly/bin/nightly
index 25830bad..fca08eb3 100755
--- a/nightly/bin/nightly
+++ b/nightly/bin/nightly
@@ -55,6 +55,12 @@ svn_new_date=`date --date=today     +%Y-%m-%dT%H:%M:%S`
 cd $ABT_TOP
 
 source $ABT_TOP/conf/$ABT_MACHINE.conf
+if [ "${ABT_JOBS}" = "" ]; then
+  ABT_JOBS=1
+fi
+if [ "${ABT_RUN_REGTEST}" = "" ]; then
+  ABT_RUN_REGTEST="cd valgrind && perl tests/vg_regtest --all"
+fi
 
 
 #----------------------------------------------------------------------------
@@ -85,19 +91,19 @@ for logfile in old new ; do
    # Check out, build, run tests
    runcmd $logfile \
           "Checking out valgrind source tree" \
-          "svn co svn://svn.valgrind.org/valgrind/trunk -r {$svn_date} valgrind" && \
+          "svn co svn://svn.valgrind.org/valgrind/trunk -r {$svn_date} valgrind && ( cd valgrind && { svn cat svn://svn.valgrind.org/valgrind/branches/CROSS_COMPILATION/vex-cross-compilation.patch | patch -p0 -s; } )" && \
    \
    runcmd $logfile \
           "Configuring valgrind             " \
-          "cd valgrind && ./autogen.sh  && ./configure --prefix=$ABT_TOP/Inst" && \
+          "cd valgrind && ./autogen.sh  && ./configure --prefix=$ABT_TOP/Inst ${ABT_CONFIGURE_OPTIONS}" && \
    \
    runcmd $logfile \
           "Building valgrind                " \
-          "cd valgrind && make && make install" && \
+          "cd valgrind && make -j ${ABT_JOBS} && make -j ${ABT_JOBS} check && make install" && \
    \
    runcmd $logfile \
           "Running regression tests         " \
-          "cd valgrind && make regtest"
+          "${ABT_RUN_REGTEST}"
 
    # Grab some indicative text for the short log file -- if the regtests
    # succeeded, show their results.  If we didn't make it that far, show the