update configure

[bacula/bacula] / regress / scripts / setup

diff --git a/regress/scripts/setup b/regress/scripts/setup
index 3ab7ce3dc5f0ce5a870fda0445d9870f309942fc..3954298fa081bb1a47d6b41f2994557b22c2a2b8 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -11,33 +11,58 @@ check_exit_code()
    fi
 }
 
+. ./config
+
 cwd=`pwd`
-if [ $# != 6 ] ; then
-   echo "Incorrect number of arguments. Got $#. Need:"
-   echo "setup bacula-src email-address --with-DBNAME --with-tcp-wrappers"
-   echo " "
-   exit 1
-fi
-if [ ! -d $1 ] ; then
-   echo "Arg 1 must be a Bacula release directory."
+if [ ! -d ${BACULA_SOURCE} ] ; then
+   echo "The BACULA_SOURCE environment variable must be a Bacula release directory, but is not."
    echo " "
    exit 1
 fi
+
+# we build and setup binaries to the $cwd/bin directory not $bin
 rm -rf build bin
 # Copy new source
-echo "Copying source from $1"
-cp -rp $1 build
+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
+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
+rm -f tmp/t$$ tmp/o$$
+# remove unneeded directories
+rm -rf build/txt build/src/testprogs
+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} $2 $3 $4 $5 $6
+./regress-config ${cwd}
 check_exit_code
-make
+# Cleanup any build in source
+make clean
+make $MAKEOPT
 check_exit_code
 make install
-check_exit_code
-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}
@@ -46,10 +71,10 @@ bin/bacula stop
 mkdir -p working
 cd bin
 echo "Running database creation scripts"
-./create_bacula_database bacula
-./drop_bacula_tables bacula
+./create_bacula_database
+./drop_bacula_tables
 ./make_bacula_tables
-./grant_bacula_privileges bacula
+./grant_bacula_privileges
 cd ${cwd}
 # Start and stop Bacula to ensure conf files are OK
 bin/bacula start