From 7c604a3aeb08e6e8cac0602b5e0a400c572c227d Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 18 Dec 2011 17:46:18 +0100 Subject: [PATCH] Fix slow regress setups --- regress/prototype.conf | 3 +++ regress/scripts/setup | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/regress/prototype.conf b/regress/prototype.conf index f6d659d504..418ac8efc3 100644 --- a/regress/prototype.conf +++ b/regress/prototype.conf @@ -1,3 +1,6 @@ +# Set this to the make option (usually -j3 or higher) +MAKEOPT= + # Where to get the source to be tested BACULA_SOURCE="${HOME}/bacula/bacula" diff --git a/regress/scripts/setup b/regress/scripts/setup index 3954298fa0..7d66033e8a 100755 --- a/regress/scripts/setup +++ b/regress/scripts/setup @@ -20,6 +20,9 @@ if [ ! -d ${BACULA_SOURCE} ] ; then exit 1 fi +MAKEOPTS=${MAKEOPT:-"-j3"} + + # we build and setup binaries to the $cwd/bin directory not $bin rm -rf build bin # Copy new source @@ -50,10 +53,10 @@ rm -f Makefile config.* check_exit_code # Cleanup any build in source make clean -make $MAKEOPT +make ${MAKEOPT} check_exit_code make install -if [ a$KEEP_SOURCE = a ]; then +if [ a${KEEP_SOURCE} = a ]; then rm -rf examples patches check_exit_code # eliminate non-essential directories to reduce -- 2.39.5