regress: add function to create many dirs

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

diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root
index 12caac0d527f8004b3663b30f2ab401eb1fa1682..86f8748ef4b85fff5b0e644508eb98f56b371102 100755 (executable)
--- a/regress/tests/usr-tape-root
+++ b/regress/tests/usr-tape-root
@@ -4,42 +4,38 @@
 #   then restore it.
 #
 cwd=`pwd`
-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/functions
 scripts/copy-tape-confs
 scripts/cleanup-tape
-echo "/usr" >/tmp/file-list
+echo "/usr" >${cwd}/tmp/file-list
+
 echo " "
 echo " "
 echo " === Starting usr-tape-root test ==="
 echo " "
 echo " "
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
-@tee /dev/null
+
+cat <<END_OF_DATA > ${cwd}/tmp/bconcmds
+@$out /dev/null
 messages
-@tee tmp/log1.out
-label storage=DDS-4 Volume=TestVolume001 slot=0
+@$out tmp/log1.out
+label storage=tape Volume=TestVolume001 slot=0
 run job=NightlySave yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@tee tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+@$out tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages
-@tee
+@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
@@ -57,8 +53,8 @@ diff tmp/original tmp/restored 2>&1 1>/dev/nul
 if [ $? != 0 ] ; then
    echo " "
    echo " "
-   echo "  ===== usr-tape-root failed!!! ===== "
-   echo "  ===== usr-tape-root failed!!! ===== " >>test.out
+   echo "  ===== !!!! usr-tape-root failed !!!! ===== "
+   echo "  ===== !!!! usr-tape-root failed !!!! ===== " >>test.out
    echo " "
 else
    echo "  ===== usr-tape-root OK ===== "