X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fusr-tape-root;h=dbc0ed9daf9050f2e0b1ff3eba1881da48d4eb4e;hb=fd7101218fa0a6a4bf69db51770fbe18b3ec2aad;hp=12caac0d527f8004b3663b30f2ab401eb1fa1682;hpb=0035cb51a290dea154c7b19324fa8aa8a0044150;p=bacula%2Fbacula

diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root
index 12caac0d52..dbc0ed9daf 100755
--- a/regress/tests/usr-tape-root
+++ b/regress/tests/usr-tape-root
@@ -4,26 +4,22 @@
 #   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
+@output /dev/null
 messages
-@tee tmp/log1.out
+@output tmp/log1.out
 label storage=DDS-4 Volume=TestVolume001 slot=0
 run job=NightlySave yes
 wait
@@ -31,12 +27,12 @@ messages
 @# 
 @# now do a restore
 @#
-@tee tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+@output 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
@@ -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 ===== "