Allow for optional parameter which specifies the database target.

reinstate create_bacula_database.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@910 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/regress/Makefile.in b/regress/Makefile.in
index d9435f914a5db270dfc2926a0efc92cc3bde38de..309452c5dcfb6d4fe9b714a3588a56ac7ec407dd 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -14,6 +14,8 @@
 # suck in user's configuration
 @CONFIG@
 
+WHICHDB?="--with-sqlite"
+
 first_rule: all
 
 all:
@@ -31,7 +33,7 @@ bacula: all
         fi)
        rm -rf tmp working
        mkdir tmp working
-       scripts/setup ${BACULA_SOURCE} ${DEPKGS} ${EMAIL} 
+       scripts/setup ${BACULA_SOURCE} ${DEPKGS} ${EMAIL} ${WHICHDB}
        scripts/do_sed ${EMAIL} ${TAPE_DRIVE} ${AUTOCHANGER} ${AUTOCHANGER_PATH}
 
 # Run all non-root userid tests

diff --git a/regress/scripts/regress-config b/regress/scripts/regress-config
index 45d91a05726468b7229b8a63671ef38f5738daeb..55c8e4c73351fc9f9858267fd8f2b7c4643d36f8 100755 (executable)
--- a/regress/scripts/regress-config
+++ b/regress/scripts/regress-config
@@ -11,7 +11,7 @@ CFLAGS="-g -O2 -Wall" \
     --with-subsys-dir=$1/working \
     --enable-smartalloc \
     --disable-readline \
-    --with-sqlite=$2 \
+    $4 \
     --with-working-dir=$1/working \
     --with-dump-email=$3 \
     --with-job-email=$3 \

diff --git a/regress/scripts/setup b/regress/scripts/setup
index d91641c0f73d942176e8f0168b3b75ca61715a20..4bc14086195a63ac3ac25258341cc1c317152831 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -3,9 +3,9 @@
 # Script to setup running Bacula regression tests
 #
 cwd=`pwd`
-if [ $# != 3 ] ; then
+if [ $# != 4 ] ; then
    echo "Incorrect number of arguments. Need:"
-   echo "setup bacula-src depkgs email-address"
+   echo "setup bacula-src depkgs email-address --with-DBNAME"
    echo " "
    exit 1
 fi
@@ -28,7 +28,7 @@ cp scripts/regress-config build
 cd build
 rm -f Makefile config.cache
 # Run Bacula configuration, make, install
-./regress-config ${cwd} $2 $3
+./regress-config ${cwd} $2 $3 $4
 make
 make install
 cp src/tools/testls ../bin
@@ -36,7 +36,7 @@ cp src/tools/testls ../bin
 cd ..
 bin/bacula stop
 cd bin
-#./create_bacula_database
+./create_bacula_database
 ./drop_bacula_tables
 ./make_bacula_tables
 ./grant_bacula_privileges