X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbtape-fill-tape;h=bca41b964d035fabd7309f23f9cf2edf0c3429f7;hb=414ee85d83197d4f61499f9542455695fa7da276;hp=c97fd11f2bbb7ba274581a56aa4634848f681c7c;hpb=128955de002b7391450fe33b0ccad5f72681ae5c;p=bacula%2Fbacula

diff --git a/regress/tests/btape-fill-tape b/regress/tests/btape-fill-tape
index c97fd11f2b..bca41b964d 100755
--- a/regress/tests/btape-fill-tape
+++ b/regress/tests/btape-fill-tape
@@ -2,30 +2,28 @@
 #
 # Test the fill command in btape
 #
-cwd=`pwd`
-scripts/copy-tape-confs
-scripts/cleanup-tape
+TestName="btape-fill-tape"
+JobName=filltape
+. scripts/functions
 
-echo "${cwd}/build" >/tmp/file-list
+copy_tape_confs
+
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
 cp ${cwd}/bin/bacula-sd.conf ${cwd}/tmp/1
 sed "s%# MaximumVolumeSize%  MaximumVolumeSize%" ${cwd}/tmp/1 >${cwd}/bin/bacula-sd.conf
 
-echo " "
-echo " "
-echo " === Starting btape fill test at `date +%R:%S` ==="
-echo " === Starting btape fill test at `date +%R:%S` ===" >>working/log
-echo " "
-exit
-bin/btape -c bin/bacula-sd.conf DDS-4 <<END_OF_DATA 2>&1 >tmp/log1.out
+start_test
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 fill
 s
-
 quit
 END_OF_DATA
 
+run_btape DDS-4
 
-grep "^The last block on the tape matches\. Test succeeded\." tmp/log1.out 2>&1 >/dev/null
+grep "^The last block on the tape matches\. Test succeeded\." ${cwd}/tmp/log1.out 2>&1 >/dev/null
 if [ $? != 0 ] ; then
    echo " "
    echo " "