Tweak regress .conf file

diff --git a/regress/freebsd.conf b/regress/freebsd.conf
deleted file mode 100644 (file)
index c1bbf96..0000000
--- a/regress/freebsd.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-# Where to get the source to be tested
-# BACULA_SOURCE="${HOME}/bacula/branch-1.36.2"
-BACULA_SOURCE="${HOME}/bacula/k"
-
-# Where to send email   !!!!! Change me !!!!!!!
-EMAIL=xxxx@domain.com
-SMTP_HOST="machine.domain.com"
-
-# Full "default" path where to find sqlite (no quotes!)
-SQLITE3_DIR=${HOME}/bacula/depkgs/sqlite3
-SQLITE_DIR=${HOME}/bacula/depkgs/sqlite
-
-TAPE_DRIVE="/dev/nsa0"
-# if you don't have an autochanger set AUTOCHANGER to /dev/null
-AUTOCHANGER="/dev/sg0"
-# For two drive tests -- set to /dev/null if you do not have it
-TAPE_DRIVE1="/dev/null"
-
-# This must be the path to the autochanger including its name
-AUTOCHANGER_PATH="/usr/local/sbin/mtx"
-
-# Set your database here
-#WHICHDB="--with-sqlite=${SQLITE_DIR}"
-#WHICHDB="--with-sqlite3=${SQLITE3_DIR}"
-WHICHDB="--with-mysql"
-#WHICHDB="--with-postgresql"
-
-# Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers"
-TCPWRAPPERS="--with-tcp-wrappers"
-
-# Set this to "" to disable OpenSSL support, "--with-openssl=yes"
-# to enable it, or provide the path to the OpenSSL installation,
-# eg "--with-openssl=/usr/local"
-#   
-# Note, you can also add any other (as many as you want) special   
-#  Bacula configuration options here, such as --disable-batch-insert
-#
-OPENSSL=""

diff --git a/regress/kern.conf b/regress/kern.conf
deleted file mode 100644 (file)
index 63719fd..0000000
--- a/regress/kern.conf
+++ /dev/null
@@ -1,51 +0,0 @@
-# Where to get the source to be tested
-#BACULA_SOURCE="${HOME}/bacula/bacula/branch-2.0"
-BACULA_SOURCE="${HOME}/bacula/k"
-
-# Where to send email   !!!!! Change me !!!!!!!
-EMAIL=xxxx@omally
-SMTP_HOST="localhost"
-
-# Full "default" path where to find sqlite (no quotes!)
-SQLITE3_DIR=${HOME}/bacula/depkgs/sqlite3
-SQLITE_DIR=${HOME}/bacula/depkgs/sqlite
-
-TAPE_DRIVE="/dev/nst0"
-# if you don't have an autochanger set AUTOCHANGER to /dev/null
-AUTOCHANGER="/dev/sg0"
-# For two drive tests -- set to /dev/null if you do not have it 
-TAPE_DRIVE1="/dev/null"
-
-# This must be the path to the autochanger including its name
-AUTOCHANGER_PATH="/usr/sbin/mtx"
-
-# Set your database here
-#WHICHDB="--with-sqlite=${SQLITE_DIR}"
-#WHICHDB="--with-sqlite3=${SQLITE3_DIR}"
-WHICHDB="--with-mysql"
-#WHICHDB="--with-postgresql"
-
-# Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers"
-TCPWRAPPERS="--with-tcp-wrappers"
-
-# Set this to "" to disable OpenSSL support, "--with-openssl=yes"
-# to enable it, or provide the path to the OpenSSL installation,
-# eg "--with-openssl=/usr/local"
-#   
-# Note, you can also add any other (as many as you want) special   
-#  Bacula configuration options here, such as --disable-batch-insert
-#
-OPENSSL="--with-openssl"
-
-# You may put your real host name here, but localhost is valid also
-#  and it has the advantage that it works on a non-newtworked machine
-HOST="127.0.0.1"
-
-# see --with-base-port at
-# http://www.bacula.org/rel-manual/Installing_Bacula.html
-# You only need to change this if you want to run more than one instance
-# of regression testing on the same box. You'll need to set BASEPORT
-# to values that do not overlap.  BASEPORT is the first of three ports
-# required by each instance, one for each of Dir, SD, and the FD.
-#
-BASEPORT=8101

diff --git a/regress/prototype.conf b/regress/prototype.conf
index 34330fd5681bd7f3168f1d7b34aacecb0a0e958f..f734facb89c880893737d31446e0586c8734b0e2 100644 (file)
--- a/regress/prototype.conf
+++ b/regress/prototype.conf
@@ -8,10 +8,12 @@ SMTP_HOST="localhost"
 # Full "default" path where to find sqlite (no quotes!)
 SQLITE3_DIR=${HOME}/bacula/depkgs/sqlite3
 
+# Set what backend to use "postresql" "mysql" or "sqlite3"
+DBTYPE="postgresql"
+
 # Set your database here
-#WHICHDB="--with-sqlite3=${SQLITE3_DIR}"
-#WHICHDB="--with-postgresql"
-WHICHDB="--with-mysql" 
+#WHICHDB="--with-${DBTYPE}=${SQLITE3_DIR}"
+WHICHDB="--with-${DBTYPE}" 
 
 # set to /dev/null if you do not have a tape drive
 # Note this is used for both the tape tests and the