From 0035cb51a290dea154c7b19324fa8aa8a0044150 Mon Sep 17 00:00:00 2001 From: Dan Langille Date: Thu, 18 Dec 2003 17:12:14 +0000 Subject: [PATCH] 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 --- regress/scripts/setup | 9 ++++++--- regress/tests/backup-bacula-tape | 7 +++++-- regress/tests/backup-bacula-test | 7 +++++-- regress/tests/bextract-test | 7 +++++-- regress/tests/bscan-test | 7 +++++-- regress/tests/bsr-opt-test | 7 +++++-- regress/tests/compressed-test | 7 +++++-- regress/tests/concurrent-jobs-test | 7 +++++-- regress/tests/dev-test-root | 7 +++++-- regress/tests/etc-test-root | 7 +++++-- regress/tests/four-concurrent-jobs-tape | 7 +++++-- regress/tests/four-concurrent-jobs-test | 7 +++++-- regress/tests/four-jobs-tape | 7 +++++-- regress/tests/four-jobs-test | 7 +++++-- regress/tests/incremental-2tape | 7 +++++-- regress/tests/incremental-tape | 7 +++++-- regress/tests/incremental-test | 7 +++++-- regress/tests/lib-tape-root | 7 +++++-- regress/tests/lib-test-root | 7 +++++-- regress/tests/recycle-test | 7 +++++-- regress/tests/restore-by-file-tape | 7 +++++-- regress/tests/restore-by-file-test | 7 +++++-- regress/tests/restore2-by-file-test | 7 +++++-- regress/tests/six-vol-test | 7 +++++-- regress/tests/small-file-size-tape | 7 +++++-- regress/tests/span-vol-test | 7 +++++-- regress/tests/sparse-compressed-test | 7 +++++-- regress/tests/sparse-test | 7 +++++-- regress/tests/two-jobs-test | 7 +++++-- regress/tests/two-vol-test | 7 +++++-- regress/tests/two-volume-tape | 7 +++++-- regress/tests/usr-tape-root | 7 +++++-- regress/tests/verify-vol-test | 7 +++++-- regress/tests/weird-files-test | 7 +++++-- regress/tests/weird-files2-test | 7 +++++-- 35 files changed, 176 insertions(+), 71 deletions(-) diff --git a/regress/scripts/setup b/regress/scripts/setup index 48d71231d3..d91641c0f7 100755 --- 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 295ebf5a27..e4cd2ba5e4 100755 --- 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 b5e2eb5c42..26d54bc5bf 100755 --- 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 47b3ffa6d8..908a966042 100755 --- 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 fa676f0bca..ee90676fee 100755 --- 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 fb19d53c12..7cfb20c703 100755 --- 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 4ade9e483c..6ed16f3d13 100755 --- 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 1f41a71d90..28a1fa1ba4 100755 --- 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 03fd455081..67638c1d36 100755 --- 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 4237156f19..ee7634ef6f 100755 --- 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 <&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 8a0281d811..e33e8c1cdd 100755 --- 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 b5f21b4271..ee6d70fbf0 100755 --- 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 b2158e6fda..d283a33174 100755 --- 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 783ec8b794..6ed796897f 100755 --- 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 43eb3f4052..c8b0bd731f 100755 --- 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 3123ccbf61..0c442894e1 100755 --- 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 ea9667cadb..87c07a4497 100755 --- 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 81ea029fdc..2b5aa81596 100755 --- 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 b51bb92bd7..8f853e4d1f 100755 --- 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 b7c9e79ecd..9b2d82bd79 100755 --- 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 93da5d8a52..101a9421dd 100755 --- 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 3ba734f327..142ebb7143 100755 --- 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 50b0f0b52b..121609e89a 100755 --- 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 c9ad79620d..4b3d327ef9 100755 --- 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 218cbc0e16..35ae3fa11b 100755 --- 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 ff0bfad849..8542ba0f9b 100755 --- 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 d25c89c053..0943b03fe2 100755 --- 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 493c1930a1..bb09dd69ce 100755 --- 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 58996d4962..bb5f73f367 100755 --- 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 cb0aa64fd2..34012aa4e1 100755 --- 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 95206c8870..12caac0d52 100755 --- 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 6d49fa97c9..7f4913b93e 100755 --- 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 d3e8995902..73a9bea331 100755 --- 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 0782eb9690..35d03a4cb4 100755 --- 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 " " -- 2.39.5