X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fusr-tape-root;h=0f5002d92836f1c40bf0f024e553913d0631e5f5;hb=464f995d79e96a677ebf5b52398ab1d38d5a954a;hp=95206c8870482272e6f8420fbf7fe0717e4eb354;hpb=a8b9586bf314ed146b28a924b96023e8d6b1f837;p=bacula%2Fbacula

diff --git a/regress/tests/usr-tape-root b/regress/tests/usr-tape-root
index 95206c8870..0f5002d928 100755
--- a/regress/tests/usr-tape-root
+++ b/regress/tests/usr-tape-root
@@ -4,23 +4,21 @@
 #   then restore it.
 #
 cwd=`pwd`
-bin/bacula stop 2>&1 >/dev/null
-bin/drop_sqlite_tables
-bin/make_sqlite_tables
-
 scripts/copy-tape-confs
 scripts/cleanup-tape
 echo "/usr" >/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
@@ -28,12 +26,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
@@ -54,8 +52,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 ===== "