ebl tweak regress scripts to be able to change binary location

[bacula/bacula] / regress / tests / lib-tape-root

diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root
index b02c15284f28f9b8cae67f5de13e7225299c3a34..df703b721128189e0295c6e18d8d930b17dc6cc3 100755 (executable)
--- a/regress/tests/lib-tape-root
+++ b/regress/tests/lib-tape-root
@@ -5,13 +5,7 @@
 #
 cwd=`pwd`
 . scripts/functions
-bin/bacula stop 2>&1 >/dev/null
-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/cleanup
 scripts/cleanup-tape
 scripts/copy-tape-confs
 echo "/lib" >${cwd}/tmp/file-list
@@ -20,7 +14,7 @@ echo " "
 echo " === Starting lib-tape-root test ==="
 echo " "
 echo " "
-bin/bacula start 2>&1 >/dev/null
+
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
@@ -40,7 +34,8 @@ messages
 @output
 quit
 END_OF_DATA
-bin/bacula stop 2>&1 >/dev/null
+run_bacula
+stop_bacula
 cd /
 ${cwd}/bin/testls -e ${cwd}/scripts/exclude-usr-test lib >${cwd}/tmp/original
 cd ${cwd}/tmp/bacula-restores