Fix configuration of default SQLite

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

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 309452c5dcfb6d4fe9b714a3588a56ac7ec407dd..6e14e50e7cf1fa94a908bc33f95839153cbd1662 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -14,7 +14,7 @@
 # suck in user's configuration
 @CONFIG@
 
-WHICHDB?="--with-sqlite"
+WHICHDB?="--with-sqlite=${SQLITE_DIR}"
 
 first_rule: all
 

diff --git a/regress/README b/regress/README
index 934681817f37b88031abec894742663261f57654..be9890a88f749a600da4e237cde0872ce68120fa 100644 (file)
--- a/regress/README
+++ b/regress/README
@@ -1,6 +1,6 @@
-     Bacula Regression
-      Kern Sibbald
-       April 2003
+      Bacula Regression
+        Kern Sibbald
+        December 2003
 
 This is Bacula's regression script directory.  At this time
 (December 2003), it is still in development, so all the tests are

diff --git a/regress/kern.conf b/regress/kern.conf
index 1b85ca11bce3a3eef5fa259b8c1ce258e4e33fce..b9d9342c53c15c99dd122dcf74851a668e12ac9d 100644 (file)
--- a/regress/kern.conf
+++ b/regress/kern.conf
@@ -1,11 +1,11 @@
 # Where to get the source to be tested
 BACULA_SOURCE="${HOME}/bacula/k"
 
-# Where to send email  !!!!! Change me !!!!!!!
+# Where to send email   !!!!! Change me !!!!!!!
 EMAIL=kern+ok@sibbald.com
 
-# Full path where to find sqlite
-DEPKGS="${HOME}/bacula/depkgs/sqlite"
+# Full "default" path where to find sqlite (no quotes!)
+SQLITE_DIR=${HOME}/bacula/depkgs/sqlite
 
 TAPE_DRIVE="/dev/nst0"
 # if you don't have an autochanger set AUTOCHANGER to /dev/null

diff --git a/regress/prototype.conf b/regress/prototype.conf
index 534f8cab367a2c2e1d824cb4e2772864ad7e4b35..14592a3f944de5351e490689c44feacc6a539a06 100644 (file)
--- a/regress/prototype.conf
+++ b/regress/prototype.conf
@@ -1,17 +1,37 @@
+#
+# Prototype personal configuration file for the regression 
+#  scripts.  Either edit this file directly, or better copy
+#  it elsewhere so it won't get overwritten.          
+#
 
+#
 # Where to get the source to be tested
-BACULA_SOURCE=""
+#
+BACULA_SOURCE=
 
 # Where to send email messages
-EMAIL=""
+#
+EMAIL=
 
-# Full path where to find sqlite
-DEPKGS="${HOME}/bacula/depkgs/sqlite"
+# Full "default" path where to find sqlite. 
+# This is only used if you do not specify a database override on the
+# make command.  
+#
+#    N.B. DON'T PUT QOUTES AROUND THE PATH.
+#
+SQLITE_DIR=${HOME}/bacula/depkgs/sqlite
 
-TAPE_DRIVE="/dev/nst0"
+#
+# The device name of your tape drive if you have one
+#
+TAPE_DRIVE=/dev/nst0
 
+#
 # if you don't have an autochanger set AUTOCHANGER to /dev/null
-AUTOCHANGER="/dev/sg0"
+#
+AUTOCHANGER=/dev/sg0
 
+#
 # This must be the path to the autochanger including its name
-AUTOCHANGER_PATH="/bin/mtx"
+#
+AUTOCHANGER_PATH=/bin/mtx

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

diff --git a/regress/scripts/setup b/regress/scripts/setup
index 4bc14086195a63ac3ac25258341cc1c317152831..8ef7b8834739d9fc5de897c2db2c3100a63c7555 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -3,9 +3,9 @@
 # Script to setup running Bacula regression tests
 #
 cwd=`pwd`
-if [ $# != 4 ] ; then
-   echo "Incorrect number of arguments. Need:"
-   echo "setup bacula-src depkgs email-address --with-DBNAME"
+if [ $# != 3 ] ; then
+   echo "Incorrect number of arguments. Got $#. Need:"
+   echo "setup bacula-src email-address --with-DBNAME"
    echo " "
    exit 1
 fi
@@ -14,13 +14,6 @@ if [ ! -d $1 ] ; then
    echo " "
    exit 1
 fi
-if [ ! -d $2 ] ; then
-   cd ..
-   cwd=`pwd`
-   echo "The regression scripts require DEPKGS as arg 2 but not found!" 
-   echo " "
-   exit 1
-fi
 rm -rf build bin
 # Copy new source
 cp -rp $1 build
@@ -28,7 +21,7 @@ cp scripts/regress-config build
 cd build
 rm -f Makefile config.cache
 # Run Bacula configuration, make, install
-./regress-config ${cwd} $2 $3 $4
+./regress-config ${cwd} $2 $3
 make
 make install
 cp src/tools/testls ../bin