X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Flib-tape-root;h=b02c15284f28f9b8cae67f5de13e7225299c3a34;hb=414ee85d83197d4f61499f9542455695fa7da276;hp=87c07a44971f62218a0bc2c744fb34532594067f;hpb=0035cb51a290dea154c7b19324fa8aa8a0044150;p=bacula%2Fbacula

diff --git a/regress/tests/lib-tape-root b/regress/tests/lib-tape-root
index 87c07a4497..b02c15284f 100755
--- a/regress/tests/lib-tape-root
+++ b/regress/tests/lib-tape-root
@@ -4,6 +4,7 @@
 #   then restore it.
 #
 cwd=`pwd`
+. scripts/functions
 bin/bacula stop 2>&1 >/dev/null
 cd bin
 ./drop_bacula_tables >/dev/null 2>&1
@@ -11,9 +12,9 @@ cd bin
 ./grant_bacula_privileges 2>&1 >/dev/null
 cd ..
 
-scripts/copy-tape-confs
 scripts/cleanup-tape
-echo "/lib" >/tmp/file-list
+scripts/copy-tape-confs
+echo "/lib" >${cwd}/tmp/file-list
 echo " "
 echo " "
 echo " === Starting lib-tape-root test ==="
@@ -23,7 +24,7 @@ bin/bacula start 2>&1 >/dev/null
 bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
 @output /dev/null
 messages
-@output tmp/log1.out
+@output ${cwd}/tmp/log1.out
 label storage=DDS-4 Volume=TestVolume001 slot=0
 run job=NightlySave yes
 wait
@@ -31,8 +32,8 @@ messages
 @# 
 @# now do a restore
 @#
-@output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all
+@output ${cwd}/tmp/log2.out
+restore where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages
@@ -53,7 +54,7 @@ sort <1 >restored
 rm -f 1
 #
 cd ${cwd}
-diff tmp/original tmp/restored 2>&1 1>/dev/nul
+diff ${cwd}/tmp/original ${cwd}/tmp/restored 2>&1 1>/dev/nul
 if [ $? != 0 ] ; then
    echo " "
    echo " "