update configure

[bacula/bacula] / regress / scripts / setup

diff --git a/regress/scripts/setup b/regress/scripts/setup
index 39b4cb920c30135d5f741363557fc19132bd93db..3954298fa081bb1a47d6b41f2994557b22c2a2b8 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -25,11 +25,11 @@ rm -rf build bin
 # Copy new source
 echo "Copying source from ${BACULA_SOURCE}"
 cp -rp ${BACULA_SOURCE} build
-which git
-if [ $? = 0 ; then
+which git >/dev/null 2>/dev/null
+if [ $? = 0 ] ; then
   git show HEAD | grep -m 1 commit | awk '{print $2}' > build/git-version
 else
-  cat "Git not found." >build/git-version
+  echo "Git not found." >build/git-version
 fi
 scripts/create_sed
 # In default bacula-dir.conf.in, change default file 
@@ -50,14 +50,16 @@ rm -f Makefile config.*
 check_exit_code
 # Cleanup any build in source
 make clean
-make -j3
+make $MAKEOPT
 check_exit_code
 make install
-rm -rf examples patches
-check_exit_code
-# eliminate non-essential directories to reduce
-#   size.  Otherwise regress run too long
-rm -rf src/win32 examples patches
+if [ a$KEEP_SOURCE = a ]; then
+   rm -rf examples patches
+   check_exit_code
+   # eliminate non-essential directories to reduce
+   #   size.  Otherwise regress run too long
+   rm -rf src/win32 examples patches
+fi
 # get all tools -- especially testls
 cd src/tools
 make installall