Commit libdbi changes

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

diff --git a/regress/do_file b/regress/do_file
deleted file mode 100755 (executable)
index 0ac4aa8..0000000
--- a/regress/do_file
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-#  /home/kern/bacula/bin/startmysql
-nice make setup
-echo " " >test.out
-cat build/config.out >>test.out
-echo " " >>test.out
-echo "Test results" >>test.out
-echo " " >>test.out
-./starttime
-nice ./all-non-root-tests
-echo " "
-echo "End do_file tests"
-echo "End do_file tests" >>test.out
-scripts/cleanup
-cat test.out
-./endtime

diff --git a/regress/scripts/bacula-dir-fifo.conf.in b/regress/scripts/bacula-dir-fifo.conf.in
index 4e51470eb812a12cba589c4d9b0ca58d0066e8c1..edc1233c970cf05d77b109f0a8d6c32f87114a23 100644 (file)
--- a/regress/scripts/bacula-dir-fifo.conf.in
+++ b/regress/scripts/bacula-dir-fifo.conf.in
@@ -161,6 +161,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/bacula-dir-migration.conf.in b/regress/scripts/bacula-dir-migration.conf.in
index ab428219a7366dff9c019bc7327ca9e80379641e..702cdd95563a5e724806b2fc1a254935b3a565f7 100644 (file)
--- a/regress/scripts/bacula-dir-migration.conf.in
+++ b/regress/scripts/bacula-dir-migration.conf.in
@@ -174,6 +174,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/bacula-dir-tape.conf.in b/regress/scripts/bacula-dir-tape.conf.in
index 3eca3aca5bfb4b5c6c1b09959301cc3214f47a18..20a95113d6e2b7548fbf7f1c64fd3bd4c94e8afa 100644 (file)
--- a/regress/scripts/bacula-dir-tape.conf.in
+++ b/regress/scripts/bacula-dir-tape.conf.in
@@ -199,6 +199,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/bacula-dir.conf.accurate.in b/regress/scripts/bacula-dir.conf.accurate.in
index 32b89f2783a69c2fe0e8e1bc13343a773ec4eb6b..5b145a9e64dc9bdfa36d7058240813aa6f154e50 100644 (file)
--- a/regress/scripts/bacula-dir.conf.accurate.in
+++ b/regress/scripts/bacula-dir.conf.accurate.in
@@ -122,6 +122,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/bacula-dir.conf.errors.in b/regress/scripts/bacula-dir.conf.errors.in
index 23d080a1ff80203887a69ecb3968d4277a4a29c3..eb84eba847be20ccfa67f594751a7c47ff764dad 100644 (file)
--- a/regress/scripts/bacula-dir.conf.errors.in
+++ b/regress/scripts/bacula-dir.conf.errors.in
@@ -204,6 +204,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/bacula-dir.conf.maxtime.in b/regress/scripts/bacula-dir.conf.maxtime.in
index 9b3fc2a9fbb62986a4ccd7da6cce8ed9dbbc77e4..80e41f4be4a13a5da31e471fcbbe5b2149af42d2 100644 (file)
--- a/regress/scripts/bacula-dir.conf.maxtime.in
+++ b/regress/scripts/bacula-dir.conf.maxtime.in
@@ -107,6 +107,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/bacula-dir.conf.regexwhere.in b/regress/scripts/bacula-dir.conf.regexwhere.in
index d2e79e634d6a26b18d69ef976c9ed8b0a936a1b0..a67b71301a7e3943305fb563a7c4f27e51e05608 100644 (file)
--- a/regress/scripts/bacula-dir.conf.regexwhere.in
+++ b/regress/scripts/bacula-dir.conf.regexwhere.in
@@ -117,6 +117,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/bacula-dir.conf.testrunscript.in b/regress/scripts/bacula-dir.conf.testrunscript.in
index f1c5192313c18c2f8acd601cb249875569deb9f2..34540bd167d15e174a617797e89a9cf3176b0579 100644 (file)
--- a/regress/scripts/bacula-dir.conf.testrunscript.in
+++ b/regress/scripts/bacula-dir.conf.testrunscript.in
@@ -227,6 +227,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/create_sed b/regress/scripts/create_sed
index f672ecc4fd69c372efc156077c538195bd2200b5..e09ae5e4b854a9e6f933bbe2bda1451adafb0bf4 100755 (executable)
--- a/regress/scripts/create_sed
+++ b/regress/scripts/create_sed
@@ -10,6 +10,8 @@ out="${cwd}/tmp/sed_tmp"
 
 # set the ports used by these tests
 BASEPORT=${BASEPORT:-8101}
+LIBDBI=${LIBDBI:- }
+libdbi=${LIBDBI}
 srcdir=${BACULA_SOURCE}
 dirport=${BASEPORT}
 fdport=`expr ${BASEPORT} '+' 1`
@@ -55,3 +57,5 @@ echo "s%@sitename@%${SITE_NAME}%g" >>${out}
 echo "s%@os@%${os}%g" >>${out}
 echo "s%@bversion@%${bversion}%g" >>${out}
 echo "s%@bdate@%${bdate}%g" >>${out}
+echo "s%@libdbi@%${libdbi}%g" >>${out}
+

diff --git a/regress/scripts/multi-client-bacula-dir.conf.in b/regress/scripts/multi-client-bacula-dir.conf.in
index 9a2e8bc6f9f56a08811b39ecf19674f3c8794faa..59e97eeca2620b4288fb40e196888bc781d2956b 100644 (file)
--- a/regress/scripts/multi-client-bacula-dir.conf.in
+++ b/regress/scripts/multi-client-bacula-dir.conf.in
@@ -324,6 +324,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/new-test-bacula-dir.conf.in b/regress/scripts/new-test-bacula-dir.conf.in
index 8910c0d30eeba5a4539b7a00d627e87e4f837715..38ce5586e36ad80286246f07d5efe88096cc6cf0 100644 (file)
--- a/regress/scripts/new-test-bacula-dir.conf.in
+++ b/regress/scripts/new-test-bacula-dir.conf.in
@@ -439,6 +439,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/test-bacula-dir.conf.in b/regress/scripts/test-bacula-dir.conf.in
index 4e6edd0850f56858093c8c967aec103ca1a05dff..e1fe75e18d631e52203ef85c5e869519f4fb33ca 100644 (file)
--- a/regress/scripts/test-bacula-dir.conf.in
+++ b/regress/scripts/test-bacula-dir.conf.in
@@ -260,6 +260,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/testa-bacula-dir.conf.in b/regress/scripts/testa-bacula-dir.conf.in
index 3a752e7d09d10a9095c805dfbb8604aadc3ca815..4741e76829471d437cb62448cf22bd96be8fdc9c 100644 (file)
--- a/regress/scripts/testa-bacula-dir.conf.in
+++ b/regress/scripts/testa-bacula-dir.conf.in
@@ -102,6 +102,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/testb-bacula-dir.conf.in b/regress/scripts/testb-bacula-dir.conf.in
index 7ad6c75c40e3402d9a26dab3282c4c133dfec963..5c9d838d192009eeaca0bb4f64df1adccce408cd 100644 (file)
--- a/regress/scripts/testb-bacula-dir.conf.in
+++ b/regress/scripts/testb-bacula-dir.conf.in
@@ -106,6 +106,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@  
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/tls-auth-bacula-dir.conf.in b/regress/scripts/tls-auth-bacula-dir.conf.in
index 98ea4c1e7ea370b217d24d8ba026d1ce951c5814..fcdfeb535b7e2dfa065c810c033eaaa3fe29fec4 100644 (file)
--- a/regress/scripts/tls-auth-bacula-dir.conf.in
+++ b/regress/scripts/tls-auth-bacula-dir.conf.in
@@ -338,6 +338,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }
 

diff --git a/regress/scripts/tls-bacula-dir.conf.in b/regress/scripts/tls-bacula-dir.conf.in
index 57140c90d28723da76a2c015cd816ce0198cd2e3..aebf2b63b5195f30425f90ec3cf1f4f3d685a2e2 100644 (file)
--- a/regress/scripts/tls-bacula-dir.conf.in
+++ b/regress/scripts/tls-bacula-dir.conf.in
@@ -335,6 +335,7 @@ Storage {
 # Generic catalog service
 Catalog {
   Name = MyCatalog
+  @libdbi@
   dbname = regress; user = regress; password = ""
 }