Update

[bacula/bacula] / regress / scripts / setup

diff --git a/regress/scripts/setup b/regress/scripts/setup
index b8923ea429a68113715970c007ed039aaa430a5b..8b15d75c62be8f4a5539a950edb2aa65e442027b 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -3,7 +3,7 @@
 # Script to setup running Bacula regression tests
 #
 cwd=`pwd`
-if [ $# != 4 ] ; then
+if [ $# != 6 ] ; then
    echo "Incorrect number of arguments. Got $#. Need:"
    echo "setup bacula-src email-address --with-DBNAME --with-tcp-wrappers"
    echo " "
@@ -21,34 +21,8 @@ cp -rp $1 build
 cp scripts/regress-config build
 cd build
 rm -f Makefile config.cache
-# Remove files that may be too big
-cd doc
-if [ -d latex ] ; then
-   cd latex
-   make clean
-   cd ..
-fi
-if [ -d latex-fr ] ; then
-   cd latex-fr
-   make clean
-   cd ..
-fi
-if [ -d images ] ; then
-   cd images
-   rm -f *.png *.jpg *.gif *.eps
-   rm -rf hires
-   cd ..
-fi
-cd ${cwd}/build
-if [ -d rescue/linux/cdrom/cdtree ] ; then
-   cd rescue/linux/cdrom/cdtree
-   rm -rf bacula-*
-   cd ..
-   rm -rf bootcd.iso
-fi 
-cd ${cwd}/build
 # Run Bacula configuration, make, install
-./regress-config ${cwd} $2 $3 $4
+./regress-config ${cwd} $2 $3 $4 $5 $6
 make
 make install
 cp src/tools/testls ../bin
@@ -56,10 +30,10 @@ cp src/tools/testls ../bin
 cd ..
 bin/bacula stop
 cd bin
-./create_bacula_database
-./drop_bacula_tables
-./make_bacula_tables
-./grant_bacula_privileges
+./create_bacula_database bacula
+./drop_bacula_tables bacula
+./make_bacula_tables bacula
+./grant_bacula_privileges bacula
 cd ..
 # Start and stop Bacula to ensure conf files are OK
 bin/bacula start