Change name of db to regress

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

diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in
index d0e4ba065455fb0a49ebc6c223323d28f504ed4a..ff30852bd8987bd7b5e693ccc83608ecbd0263eb 100644 (file)
--- a/regress/scripts/new-test-bacula-dir.conf.in
+++ b/regress/scripts/new-test-bacula-dir.conf.in
@@ -124,7 +124,7 @@ Job {
   Messages = Standard
   Pool = Default
   # This creates an ASCII copy of the catalog
-  RunBeforeJob = "@sbindir@/make_catalog_backup -u bacula"
+  RunBeforeJob = "@sbindir@/make_catalog_backup -u regress"
   # This deletes the copy of the catalog
   RunAfterJob  = "@sbindir@/delete_catalog_backup"
   Write Bootstrap = "@working_dir@/BackupCatalog.bsr"
@@ -323,7 +323,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
-  dbname = bacula; user = bacula; password = ""
+  dbname = regress; user = regress; password = ""
 }
 
 # Reasonable message delivery -- send most everything to email address

diff --git a/regress/scripts/regress-config b/regress/scripts/regress-config
index 7fdae76929a38a362aa3ed31ebde46b73aa917ca..6f8d9476712767dc514a3ee3a07063818f5b228b 100755 (executable)
--- a/regress/scripts/regress-config
+++ b/regress/scripts/regress-config
@@ -16,6 +16,8 @@ CFLAGS="-g -O2 -Wall" \
     --with-dump-email=$2 \
     --with-job-email=$2 \
     --with-smtp-host=$5 \
+    --with-db-name=regress \
+    --with-db-user=regress \
     $3 \
     --with-baseport=8101 \
     $4 \

diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index 59dbc6f287bc7ef1c5ee6856638178dee0977bd2..7a4d72bf34b13e2aea0f2a8916c18acdbc342391 100644 (file)
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -112,7 +112,7 @@ Job {
   Messages = Standard
   Pool = Default
   # This creates an ASCII copy of the catalog
-  RunBeforeJob = "@sbindir@/make_catalog_backup -u bacula"
+  RunBeforeJob = "@sbindir@/make_catalog_backup -u regress"
   # This deletes the copy of the catalog
   RunAfterJob  = "@sbindir@/delete_catalog_backup"
   Write Bootstrap = "@working_dir@/BackupCatalog.bsr"
@@ -260,7 +260,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
-  dbname = bacula; user = bacula; password = ""
+  dbname = regress; user = regress; password = ""
 }
 
 # Reasonable message delivery -- send most everything to email address

diff --git a/regress/scripts/testa-bacula-dir.conf.in b/regress/scripts/testa-bacula-dir.conf.in
index ce433854f63edc6a64488dff3cb7da2cef4b81e5..b5d8d3df6721c20ce9608cd54409ce287ab7542c 100644 (file)
--- a/regress/scripts/testa-bacula-dir.conf.in
+++ b/regress/scripts/testa-bacula-dir.conf.in
@@ -102,7 +102,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
-  dbname = bacula; user = bacula; password = ""
+  dbname = regress; user = regress; password = ""
 }
 
 # Reasonable message delivery -- send most everything to email address

diff --git a/regress/tests/bscan-fast-tape b/regress/tests/bscan-fast-tape
index 2c8121896dffe33320ad3cd25e7752192eb3429d..2a54d4bf1d162f3354fa6a7331d7024d410dde01 100755 (executable)
--- a/regress/tests/bscan-fast-tape
+++ b/regress/tests/bscan-fast-tape
@@ -62,7 +62,7 @@ cd ..
 
 echo "Begin attempt to read tape that crashes the system"
 echo "volume=TestVolume001" >tmp/bscan.bsr
-strace -o strace.new bin/bscan -d200 -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4
+strace -o strace.new bin/bscan -d200 -w working -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4
 exit
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null

diff --git a/regress/tests/bscan-tape b/regress/tests/bscan-tape
index 7f7e708c1e6d45bf64a9862fbba91f936a8d1fd6..56ef6e273b268af534fc4b645c4e7343fa94d70b 100755 (executable)
--- a/regress/tests/bscan-tape
+++ b/regress/tests/bscan-tape
@@ -115,7 +115,7 @@ cd bin
 cd ..
 
 echo "volume=TestVolume001" >tmp/bscan.bsr
-bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 2>&1 >/dev/null
+bin/bscan -w working -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf DDS-4 2>&1 >/dev/null
 
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index 91fa8598a2c89b9b15e76551c7efba2e1a279aae..92e81651d6e4958037029364aad80e39bbca68c1 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -53,9 +53,9 @@ stop_bacula
 echo "volume=TestVolume001|TestVolume002" >tmp/bscan.bsr
 
 if test "$debug" -eq 1 ; then
-  bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp
+  bin/bscan -w working -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp
 else
-  bin/bscan -w working -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >/dev/null
+  bin/bscan -w working -u regress -n regress -m -s -v -b tmp/bscan.bsr -c bin/bacula-sd.conf ${cwd}/tmp 2>&1 >/dev/null
 fi
 
 cat <<END_OF_DATA >tmp/bconcmds