From: Bart Van Assche Date: Mon, 8 Sep 2008 18:43:53 +0000 (+0000) Subject: - Added support for the variable ABT_JOBS, number of jobs to run in parallel. X-Git-Tag: svn/VALGRIND_3_4_0~265 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdececd1850a7076a7f8792016a7ffa66ec418eb;p=thirdparty%2Fvalgrind.git - 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 --- diff --git a/nightly/bin/nightly b/nightly/bin/nightly index 25830bade9..fca08eb351 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