From 677c124d0f9ea308d5a07398556c69774338c357 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Tue, 15 Apr 2008 12:03:27 +0000 Subject: [PATCH] Commit libdbi changes git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@6817 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/do_file | 16 ---------------- regress/scripts/bacula-dir-fifo.conf.in | 1 + regress/scripts/bacula-dir-migration.conf.in | 1 + regress/scripts/bacula-dir-tape.conf.in | 1 + regress/scripts/bacula-dir.conf.accurate.in | 1 + regress/scripts/bacula-dir.conf.errors.in | 1 + regress/scripts/bacula-dir.conf.maxtime.in | 1 + regress/scripts/bacula-dir.conf.regexwhere.in | 1 + regress/scripts/bacula-dir.conf.testrunscript.in | 1 + regress/scripts/create_sed | 4 ++++ regress/scripts/multi-client-bacula-dir.conf.in | 1 + regress/scripts/new-test-bacula-dir.conf.in | 1 + regress/scripts/test-bacula-dir.conf.in | 1 + regress/scripts/testa-bacula-dir.conf.in | 1 + regress/scripts/testb-bacula-dir.conf.in | 1 + regress/scripts/tls-auth-bacula-dir.conf.in | 1 + regress/scripts/tls-bacula-dir.conf.in | 1 + 17 files changed, 19 insertions(+), 16 deletions(-) delete mode 100755 regress/do_file diff --git a/regress/do_file b/regress/do_file deleted file mode 100755 index 0ac4aa8bf3..0000000000 --- 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 4e51470eb8..edc1233c97 100644 --- 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 ab428219a7..702cdd9556 100644 --- 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 3eca3aca5b..20a95113d6 100644 --- 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 32b89f2783..5b145a9e64 100644 --- 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 23d080a1ff..eb84eba847 100644 --- 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 9b3fc2a9fb..80e41f4be4 100644 --- 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 d2e79e634d..a67b71301a 100644 --- 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 f1c5192313..34540bd167 100644 --- 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 f672ecc4fd..e09ae5e4b8 100755 --- 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 9a2e8bc6f9..59e97eeca2 100644 --- 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 8910c0d30e..38ce5586e3 100644 --- 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 4e6edd0850..e1fe75e18d 100644 --- 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 3a752e7d09..4741e76829 100644 --- 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 7ad6c75c40..5c9d838d19 100644 --- 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 98ea4c1e7e..fcdfeb535b 100644 --- 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 57140c90d2..aebf2b63b5 100644 --- 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 = "" } -- 2.39.5