Fix slow regress setups

diff --git a/regress/prototype.conf b/regress/prototype.conf
index f6d659d504802424a2552ebe4e44f8f5b7ef5d9b..418ac8efc36b3738f4e5d4529d81b8ecd33da461 100644 (file)
--- 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 3954298fa081bb1a47d6b41f2994557b22c2a2b8..7d66033e8ae82707a2e1012f8400a6bab6b96b2b 100755 (executable)
--- 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