replace references to sqlite scripts with generic bacula scripts.

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

diff --git a/regress/scripts/setup b/regress/scripts/setup
index 48d71231d35c0e770068a6fbca8fd6236ff9926f..d91641c0f73d942176e8f0168b3b75ca61715a20 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -35,9 +35,12 @@ cp src/tools/testls ../bin
 
 cd ..
 bin/bacula stop
-bin/create_sqlite_database
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+#./create_bacula_database
+./drop_bacula_tables
+./make_bacula_tables
+./grant_bacula_privileges
+cd ..
 # Start and stop Bacula to ensure conf files are OK
 bin/bacula start
 bin/bacula stop

diff --git a/regress/tests/backup-bacula-tape b/regress/tests/backup-bacula-tape
index 295ebf5a274924935cffcfa2982e23044ca3ae86..e4cd2ba5e446403a229a144ab00dd96f9035c909 100755 (executable)
--- a/regress/tests/backup-bacula-tape
+++ b/regress/tests/backup-bacula-tape
@@ -9,8 +9,11 @@ bin/bacula stop  2>&1 >/dev/null
 scripts/copy-tape-confs
 scripts/cleanup-tape
 echo "${cwd}/build" >/tmp/file-list
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/backup-bacula-test b/regress/tests/backup-bacula-test
index b5e2eb5c424088cd52f1e2bee5238ca4b1981ccc..26d54bc5bf5710607430d308eff7b7a845b80cc9 100755 (executable)
--- a/regress/tests/backup-bacula-test
+++ b/regress/tests/backup-bacula-test
@@ -7,8 +7,11 @@ cwd=`pwd`
 scripts/copy-confs
 scripts/cleanup
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges >/dev/null 2>&1
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/bextract-test b/regress/tests/bextract-test
index 47b3ffa6d8aa3e2205fb94505b84571790b8df03..908a9660423067a3a388f3da0c8c492585bf9c2d 100755 (executable)
--- a/regress/tests/bextract-test
+++ b/regress/tests/bextract-test
@@ -9,8 +9,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/bscan-test b/regress/tests/bscan-test
index fa676f0bcad5125bdea0bdd2c36b49525678991d..ee90676feef6ecc3547dd5a84ef95254355cbf32 100755 (executable)
--- a/regress/tests/bscan-test
+++ b/regress/tests/bscan-test
@@ -10,8 +10,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index fb19d53c125efcf17f966c4d754ba44078df22b0..7cfb20c703633de7de50a40d358fd275d0bd4034 100755 (executable)
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -11,8 +11,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/compressed-test b/regress/tests/compressed-test
index 4ade9e483ca7c26b4128c2b516b5a8e8e7555e24..6ed16f3d13fa81d95e6d1e5e81769281f64fc9f0 100755 (executable)
--- a/regress/tests/compressed-test
+++ b/regress/tests/compressed-test
@@ -8,8 +8,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop  2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/concurrent-jobs-test b/regress/tests/concurrent-jobs-test
index 1f41a71d9063d63d89de1d1abc863beb213dae61..28a1fa1ba4294f525f816b6df1750b3a324f2bf5 100755 (executable)
--- a/regress/tests/concurrent-jobs-test
+++ b/regress/tests/concurrent-jobs-test
@@ -23,8 +23,11 @@ fi
 
 echo "largefile created"
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/dev-test-root b/regress/tests/dev-test-root
index 03fd4550818839f23718bc4088edb2ccefb68dc2..67638c1d3628ca5f12569f782aeeeb0eea3279d4 100755 (executable)
--- a/regress/tests/dev-test-root
+++ b/regress/tests/dev-test-root
@@ -17,8 +17,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "/dev" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 echo " "
 echo " "
 echo " === Starting /dev save/restore test ==="

diff --git a/regress/tests/etc-test-root b/regress/tests/etc-test-root
index 4237156f19e5dd053a8bb2353e0873b8750dfd9c..ee7634ef6f3a83e320b1f90e3ad3d54ce5001395 100755 (executable)
--- a/regress/tests/etc-test-root
+++ b/regress/tests/etc-test-root
@@ -22,8 +22,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "/etc" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null

diff --git a/regress/tests/four-concurrent-jobs-tape b/regress/tests/four-concurrent-jobs-tape
index d082bbfd3cb895ef3e7ea7e3830f6f39a3526d14..400d3fda8841d5573354684ae4a45f1f8cbcc400 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-tape
+++ b/regress/tests/four-concurrent-jobs-tape
@@ -4,8 +4,11 @@
 #
 cwd=`pwd`
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 scripts/copy-tape-confs
 scripts/cleanup-tape
 echo "${cwd}/build" >/tmp/file-list

diff --git a/regress/tests/four-concurrent-jobs-test b/regress/tests/four-concurrent-jobs-test
index 8a0281d8112b0f6babbfd2cd48fbb7bcc7ac7ffc..e33e8c1cdd6bc8c1a7cecd4390cb2b90543859ac 100755 (executable)
--- a/regress/tests/four-concurrent-jobs-test
+++ b/regress/tests/four-concurrent-jobs-test
@@ -7,8 +7,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/four-jobs-tape b/regress/tests/four-jobs-tape
index b5f21b427153f590709e6a9705456025c2745108..ee6d70fbf0fb05da9c742bb896ae000874c20b4d 100755 (executable)
--- a/regress/tests/four-jobs-tape
+++ b/regress/tests/four-jobs-tape
@@ -6,8 +6,11 @@
 #
 cwd=`pwd`
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 scripts/copy-tape-confs
 scripts/cleanup-tape

diff --git a/regress/tests/four-jobs-test b/regress/tests/four-jobs-test
index b2158e6fda86ebc1302f0254ec2e82afecff46a1..d283a33174a5b9732b431895bfc80fd1cfef6c92 100755 (executable)
--- a/regress/tests/four-jobs-test
+++ b/regress/tests/four-jobs-test
@@ -9,8 +9,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/incremental-2tape b/regress/tests/incremental-2tape
index 783ec8b794fe46b35d97806b779be1209232e3d8..6ed796897f4042479032c74fa96fdb0eee44939f 100755 (executable)
--- a/regress/tests/incremental-2tape
+++ b/regress/tests/incremental-2tape
@@ -7,8 +7,11 @@
 #
 cwd=`pwd`
 bin/bacula stop  2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 scripts/copy-2tape-confs
 scripts/cleanup-2tape

diff --git a/regress/tests/incremental-tape b/regress/tests/incremental-tape
index 43eb3f40524008e6c10131df0e7d92c66cb8dcda..c8b0bd731fc277d8b6e5696eb094a22c22883d81 100755 (executable)
--- a/regress/tests/incremental-tape
+++ b/regress/tests/incremental-tape
@@ -5,8 +5,11 @@
 #
 cwd=`pwd`
 bin/bacula stop  2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 scripts/copy-tape-confs
 scripts/cleanup-tape

diff --git a/regress/tests/incremental-test b/regress/tests/incremental-test
index 3123ccbf615073850fb777696a91b6227efc7898..0c442894e1c4cb27964ab64c36c10e21b31748cd 100755 (executable)
--- a/regress/tests/incremental-test
+++ b/regress/tests/incremental-test
@@ -14,8 +14,11 @@ echo "${cwd}/tmp/build/ficheriro1.txt" >restore-list
 echo "${cwd}/tmp/build/ficheriro2.txt" >>restore-list
 cd ${cwd}
 bin/bacula stop  2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root
index ea9667cadbd5afb97aec429bf32f1bfc01fff1ef..87c07a44971f62218a0bc2c744fb34532594067f 100755 (executable)
--- a/regress/tests/lib-tape-root
+++ b/regress/tests/lib-tape-root
@@ -5,8 +5,11 @@
 #
 cwd=`pwd`
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 scripts/copy-tape-confs
 scripts/cleanup-tape

diff --git a/regress/tests/lib-test-root b/regress/tests/lib-test-root
index 81ea029fdcc111c09a084517fb349366804dc734..2b5aa8159654ed5bf30e69d3c99ab1e51c22d196 100755 (executable)
--- a/regress/tests/lib-test-root
+++ b/regress/tests/lib-test-root
@@ -17,8 +17,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "/lib" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 echo " "
 echo " "
 echo " === Starting /lib save/restore test ==="

diff --git a/regress/tests/recycle-test b/regress/tests/recycle-test
index b51bb92bd7fbde0598b9796fbf5d7a3315a96bdd..8f853e4d1f3b9050cfd2f7af46382bd5cfe82a5b 100755 (executable)
--- a/regress/tests/recycle-test
+++ b/regress/tests/recycle-test
@@ -10,8 +10,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/restore-by-file-tape b/regress/tests/restore-by-file-tape
index b7c9e79ecdd587003a1806a8a26ad8b867eda0b4..9b2d82bd79cacd256461dfceece6ebdb0d7280ed 100755 (executable)
--- a/regress/tests/restore-by-file-tape
+++ b/regress/tests/restore-by-file-tape
@@ -12,8 +12,11 @@ scripts/copy-tape-confs
 scripts/cleanup-tape
 echo "${cwd}/build" >/tmp/file-list
 sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 

diff --git a/regress/tests/restore-by-file-test b/regress/tests/restore-by-file-test
index 93da5d8a52bdef246894a412bc70c35ffe0c66de..101a9421dd3e410bca6c573614d81ba2b2fada8d 100755 (executable)
--- a/regress/tests/restore-by-file-test
+++ b/regress/tests/restore-by-file-test
@@ -16,8 +16,11 @@ sed s%\^%${cwd}/tmp/build/% 1 >restore-list
 rm -f 1
 cd ${cwd}
 bin/bacula stop  2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/restore2-by-file-test b/regress/tests/restore2-by-file-test
index 3ba734f327a1a6b014d10b310a792cc0f8f3963b..142ebb71436c56e4dfb1d6ddd9c0053711258ddc 100755 (executable)
--- a/regress/tests/restore2-by-file-test
+++ b/regress/tests/restore2-by-file-test
@@ -9,8 +9,11 @@ scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 sed s%\^%${cwd}% ${cwd}/scripts/flist >${cwd}/tmp/restore2-list
 bin/bacula stop  2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/six-vol-test b/regress/tests/six-vol-test
index 50b0f0b52bbc92b9f5980cbb85517445b7afa2dd..121609e89a646cb6d0a9600af468f14a32837088 100755 (executable)
--- a/regress/tests/six-vol-test
+++ b/regress/tests/six-vol-test
@@ -17,8 +17,11 @@ echo "Creating a 56MB file with random data ..."
 dd if=/dev/urandom of=${cwd}/tmp/largefile bs=1024 count=55000
 echo "largefile created"
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/small-file-size-tape b/regress/tests/small-file-size-tape
index c9ad79620d3c4fb39dc0a294ea2806fbbca0511f..4b3d327ef9cd52d510f90243df8a7a88b327610c 100755 (executable)
--- a/regress/tests/small-file-size-tape
+++ b/regress/tests/small-file-size-tape
@@ -8,8 +8,11 @@ bin/bacula stop  2>&1 >/dev/null
 scripts/copy-tape-confs
 scripts/cleanup-tape
 echo "${cwd}/build" >/tmp/file-list
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed "s%# Maximum File Size%  Maximum File Size%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 

diff --git a/regress/tests/span-vol-test b/regress/tests/span-vol-test
index 218cbc0e167fe650476d52aad0a3507844643cb0..35ae3fa11b80ab461f55bb00783f5a93e514fcfa 100755 (executable)
--- a/regress/tests/span-vol-test
+++ b/regress/tests/span-vol-test
@@ -10,8 +10,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/sparse-compressed-test b/regress/tests/sparse-compressed-test
index ff0bfad84921828c04b64997f063200ddd38d42c..8542ba0f9bc91bd7af70c20428e3ebf35431d747 100755 (executable)
--- a/regress/tests/sparse-compressed-test
+++ b/regress/tests/sparse-compressed-test
@@ -8,8 +8,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/sparse-test b/regress/tests/sparse-test
index d25c89c05313a9f192850a17137603fa4f230d07..0943b03fe2f5eecf43fba8902df1a557dae5d667 100755 (executable)
--- a/regress/tests/sparse-test
+++ b/regress/tests/sparse-test
@@ -8,8 +8,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/two-jobs-test b/regress/tests/two-jobs-test
index 493c1930a18ebd82303207cf3bc3d3650f58eb7d..bb09dd69ce4b2754f33e86223eab77d3c7eb1599 100755 (executable)
--- a/regress/tests/two-jobs-test
+++ b/regress/tests/two-jobs-test
@@ -8,8 +8,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/two-vol-test b/regress/tests/two-vol-test
index 58996d49622d6e58e41cc709dcf22c919d2ce37e..bb5f73f36710eced476af3a7ee915d5829da5755 100755 (executable)
--- a/regress/tests/two-vol-test
+++ b/regress/tests/two-vol-test
@@ -8,8 +8,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/two-volume-tape b/regress/tests/two-volume-tape
index cb0aa64fd2b6da5d205d1bba127b0006c08d84f7..34012aa4e172981c9c0664e152599e6bb60427e5 100755 (executable)
--- a/regress/tests/two-volume-tape
+++ b/regress/tests/two-volume-tape
@@ -8,8 +8,11 @@ bin/bacula stop  2>&1 >/dev/null
 scripts/copy-2tape-confs
 scripts/prepare-two-tapes
 echo "${cwd}/build" >/tmp/file-list
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 out="tmp/sed_tmp"
 echo "s%# Maximum File Size%  Maximum File Size%g" >${out}
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1

diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root
index 95206c8870482272e6f8420fbf7fe0717e4eb354..12caac0d527f8004b3663b30f2ab401eb1fa1682 100755 (executable)
--- a/regress/tests/usr-tape-root
+++ b/regress/tests/usr-tape-root
@@ -5,8 +5,11 @@
 #
 cwd=`pwd`
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 scripts/copy-tape-confs
 scripts/cleanup-tape

diff --git a/regress/tests/verify-vol-test b/regress/tests/verify-vol-test
index 6d49fa97c93646f447a8375206c4800faf0ca8ff..7f4913b93ea308a305918e505e4f788083a4cb94 100755 (executable)
--- a/regress/tests/verify-vol-test
+++ b/regress/tests/verify-vol-test
@@ -8,8 +8,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/build" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/weird-files-test b/regress/tests/weird-files-test
index d3e89959020893824fa8b8df74564c71630a92ea..73a9bea3311f7906c88bf1cd9dbccb035ae1b582 100755 (executable)
--- a/regress/tests/weird-files-test
+++ b/regress/tests/weird-files-test
@@ -13,8 +13,11 @@ scripts/copy-test-confs
 scripts/cleanup
 echo "${cwd}/weird-files" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "

diff --git a/regress/tests/weird-files2-test b/regress/tests/weird-files2-test
index 0782eb9690bb9aa386739a53be77a0262b6aa3af..35d03a4cb4db3250e4c96b5f3a73dd1d32c1edeb 100755 (executable)
--- a/regress/tests/weird-files2-test
+++ b/regress/tests/weird-files2-test
@@ -15,8 +15,11 @@ rm -rf weird-files2
 cp -Rp weird-files weird-files2
 echo "${cwd}/weird-files2" >/tmp/file-list
 bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
+cd bin
+./drop_bacula_tables >/dev/null 2>&1
+./make_bacula_tables >/dev/null 2>&1
+./grant_bacula_privileges 2>&1 >/dev/null
+cd ..
 
 echo " "
 echo " "