update configure

[bacula/bacula] / regress / scripts / setup

diff --git a/regress/scripts/setup b/regress/scripts/setup
index 6013db2fcaf0f81c24ecca55c6fa55e6563f18e3..3954298fa081bb1a47d6b41f2994557b22c2a2b8 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -25,6 +25,12 @@ rm -rf build bin
 # Copy new source
 echo "Copying source from ${BACULA_SOURCE}"
 cp -rp ${BACULA_SOURCE} build
+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
@@ -38,21 +44,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}