Add logdir and bsrdir to regression config

[bacula/bacula] / regress / scripts / setup

diff --git a/regress/scripts/setup b/regress/scripts/setup
index fc8fc8d899bb659be8f90470bf8c4820c0cc1740..2f7a75d9ba6955b8e771a883939ca53e05ff2f50 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -20,18 +20,32 @@ 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
 echo "Copying source from ${BACULA_SOURCE}"
 cp -rp ${BACULA_SOURCE} build
-git show HEAD | grep -m 1 commit | awk '{print $2}' > build/git-version
+which git >/dev/null 2>/dev/null
+if [ $? = 0 ] ; then
+  git show HEAD | grep -m 1 commit | awk '{print $2}' > build/git-version
+else
+  echo "Git not found." >build/git-version
+fi
 scripts/create_sed
 # In default bacula-dir.conf.in, change default file 
 # to backup to be build directory
 echo "s%File = @sbindir@%File = @BUILD_DIR@%g" >tmp/t$$
 sed -f tmp/t$$ build/src/dird/bacula-dir.conf.in >tmp/o$$
 cp tmp/o$$ build/src/dird/bacula-dir.conf.in
+
+# Now turn on DEVELOPER for regression testing
+echo "s%^.*define DEVELOPER 1.*$%#define DEVELOPER 1%g" >tmp/t$$
+sed -f tmp/t$$ build/src/version.h >tmp/o$$
+cp tmp/o$$ build/src/version.h
+
 rm -f tmp/t$$ tmp/o$$
 # remove unneeded directories
 rm -rf build/txt build/src/testprogs
@@ -39,21 +53,25 @@ sed -f tmp/sed_tmp scripts/regress-config.in >scripts/regress-config
 chmod 755 scripts/regress-config
 cp scripts/regress-config build
 cd build
-rm -f Makefile config.cache
+rm -f Makefile config.*
 # Run Bacula configuration, make, install
 ./regress-config ${cwd}
 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
-cp src/tools/testls ../bin
+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
 check_exit_code
 
 cd ${cwd}