From 532be1bd94f525333419cf217171d7f1e035fddd Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 4 Jun 2007 07:05:07 +0000 Subject: [PATCH] Update git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4974 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/freebsd.conf | 15 +++++++++++---- regress/kern.conf | 6 +++++- regress/prototype.conf | 4 ++++ regress/tests/sparse-encrypt-test | 1 + 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/regress/freebsd.conf b/regress/freebsd.conf index 823eb9cbbf..c1bbf96866 100644 --- a/regress/freebsd.conf +++ b/regress/freebsd.conf @@ -3,10 +3,11 @@ BACULA_SOURCE="${HOME}/bacula/k" # Where to send email !!!!! Change me !!!!!!! -EMAIL=kern@sibbald.com -SMTP_HOST="matou.sibbald.com" +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" @@ -19,8 +20,10 @@ TAPE_DRIVE1="/dev/null" AUTOCHANGER_PATH="/usr/local/sbin/mtx" # Set your database here -WHICHDB?="--with-sqlite=${SQLITE_DIR}" -#WHICHDB="--with-mysql=${HOME}/mysql" +#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" @@ -28,4 +31,8 @@ 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 index 19af1ba8c3..71990b9f49 100644 --- a/regress/kern.conf +++ b/regress/kern.conf @@ -3,7 +3,7 @@ BACULA_SOURCE="${HOME}/bacula/k" # Where to send email !!!!! Change me !!!!!!! -EMAIL=kern@omally +EMAIL=xxxx@omally SMTP_HOST="localhost" # Full "default" path where to find sqlite (no quotes!) @@ -31,4 +31,8 @@ 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" diff --git a/regress/prototype.conf b/regress/prototype.conf index 035d911272..eebf594360 100644 --- a/regress/prototype.conf +++ b/regress/prototype.conf @@ -30,4 +30,8 @@ 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" diff --git a/regress/tests/sparse-encrypt-test b/regress/tests/sparse-encrypt-test index 1a504ce127..39f07b8782 100755 --- a/regress/tests/sparse-encrypt-test +++ b/regress/tests/sparse-encrypt-test @@ -18,6 +18,7 @@ if [ $? != 0 ]; then fi cd ${cwd} +change_jobname SparseTest $JobName start_test cat <tmp/bconcmds -- 2.39.5