X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=regress%2Ftests%2Flib-tape-root;h=9044d1c088c7968967fe6d4373d6941834c249bd;hb=7d893884848432f4da69cbafe2021176b2d2a275;hp=b02c15284f28f9b8cae67f5de13e7225299c3a34;hpb=5aaea29875378ce6de2b530141124d1a892edc2a;p=bacula%2Fbacula

diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root
index b02c15284f..9044d1c088 100755
--- 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,8 +14,8 @@ 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
+
+cat <<END_OF_DATA > >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
 @output ${cwd}/tmp/log1.out
@@ -40,7 +34,10 @@ 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