Update

[bacula/bacula] / regress / tests / btape-fill-tape

diff --git a/regress/tests/btape-fill-tape b/regress/tests/btape-fill-tape
index 37d5bd54130aaea8c225f895b175b09ea5538b7c..e84e465100e9187ea4c521a87b1e8e08317131df 100755 (executable)
--- a/regress/tests/btape-fill-tape
+++ b/regress/tests/btape-fill-tape
@@ -2,32 +2,28 @@
 #
 # Test the fill command in btape
 #
-cwd=`pwd`
-bin/bacula stop  2>&1 >/dev/null
-scripts/copy-tape-confs
-scripts/cleanup-tape
+TestName="btape-fill-tape"
+JobName=filltape
+. scripts/functions
+set_debug 0
+
+copy_tape_confs
+
 echo "${cwd}/build" >/tmp/file-list
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
+
 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 ==="
-echo " === Starting btape fill test ===" >>working/log
-echo " "
+start_test
 
-bin/btape -c bin/bacula-sd.conf DDS-4 <<END_OF_DATA 2>&1 >tmp/log1.out
+cat <<END_OF_DATA >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
 if [ $? != 0 ] ; then