Partial work on virtual-backup2-test

[bacula/bacula] / regress / scripts / regress-config.in

diff --git a/regress/scripts/regress-config.in b/regress/scripts/regress-config.in
old mode 100644 (file)
new mode 100755 (executable)
index db54892..73e78e8
--- a/regress/scripts/regress-config.in
+++ b/regress/scripts/regress-config.in
@@ -4,6 +4,11 @@
 #
 
 . ${1}/config
+if test "x@db_password@" = "x"; then
+  PASSWD=
+else
+  PASSWO="--with-db-password=\"@db_password@\""
+fi
 
 CFLAGS="-g -O2 -Wall" \
  ./configure \
@@ -21,35 +26,7 @@ CFLAGS="-g -O2 -Wall" \
     --with-smtp-host=${SMTP_HOST} \
     --with-db-name=@db_name@ \
     --with-db-user=@db_user@ \
-    ${OPENSSL} \
-    ${TCPWRAPPERS} \
-    ${WHICHDB} \
-    --with-baseport=${BASEPORT}
-
-exit 0
-#!/bin/sh
-#
-# This is the configuration script for regression testing
-#
-
-. ${1}/config
-
-CFLAGS="-g -O2 -Wall" \
- ./configure \
-    --sbindir=${1}/bin \
-    --sysconfdir=${1}/bin \
-    --mandir=${1}/bin \
-    --with-pid-dir=${1}/working \
-    --with-subsys-dir=${1}/working \
-    --enable-smartalloc \
-    --disable-readline \
-    --with-working-dir=${1}/working \
-    --with-archivedir=${1}/tmp \
-    --with-dump-email=${EMAIL} \
-    --with-job-email=${EMAIL} \
-    --with-smtp-host=${SMTP_HOST} \
-    --with-db-name=@db_name@ \
-    --with-db-user=@db_user@ \
+    ${PASSWD} \
     ${OPENSSL} \
     ${TCPWRAPPERS} \
     ${WHICHDB} \