X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbackup-win32-tape;h=2c67ddce85eb4a6b8d7bad4e020a4362e2909f84;hb=86e786f4fb2faf7c9487a0bf4633371cbb57b759;hp=3723b536dd64eaa84f61c123b3148cd84c7db79c;hpb=99315e9010cc655fd57346986dc4dc807838eecf;p=bacula%2Fbacula

diff --git a/regress/tests/backup-win32-tape b/regress/tests/backup-win32-tape
index 3723b536dd..2c67ddce85 100755
--- a/regress/tests/backup-win32-tape
+++ b/regress/tests/backup-win32-tape
@@ -4,23 +4,23 @@
 #   to a tape then restore it, we do that twice to ensure that
 #   we can correctly append to a tape.
 #
-cwd=`pwd`
-scripts/copy-win32-confs
+TestName="backup-win32-tape"
+JobName=backupwintape
+. scripts/functions
+
 scripts/cleanup-tape
+scripts/copy-win32-confs
 
-echo "${cwd}/build" >/tmp/file-list
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-echo " "
-echo " "
-echo " === Starting Backup Win32 tape test at `date +%R:%S` ==="
-echo " === Starting Backup Win32 tape test at `date +%R:%S` ===" >>working/log
-echo " "
+change_jobname $JobName
+start_test
 
-bin/bacula start 2>&1 >/dev/null
-bin/bconsole -c bin/bconsole.conf <<END_OF_DATA
+
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @output /dev/null
 messages
-@tee tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=DDS-4 volume=TestVolume001 slot=0 pool=Default
 run job=NightlySave yes
 @sleep 10
@@ -32,25 +32,17 @@ messages
 @# 
 @# now do a restore
 @#
-@#output tmp/log2.out
+@$outt ${cwd}/tmp/log2.out
 @#restore where=${cwd}/tmp/bacula-restores select all storage=DDS-4 done
 @#yes
 @#wait
 @#messages
 END_OF_DATA
-scripts/check_for_zombie_jobs storage=DDS-4
 
-bin/bacula stop 2>&1 >/dev/null
-grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
-bstat=$?
-if [ $bstat != 0 ] ; then
-   echo " "
-   echo " "
-   echo "  !!!!! Backup Win32 tape test failed!!! !!!!! "
-   echo "  !!!!! Backup Win32 tape test failed!!! !!!!! " >>test.out
-   echo " "
-else
-   echo "  ===== Backup Win32 tape test OK ===== "
-   echo "  ===== Backup Win32 tape test OK ===== " >>test.out
-   scripts/cleanup
-fi
+run_bacula
+check_for_zombie_jobs storage=DDS-4
+stop_bacula
+
+check_two_logs
+check_restore_diff
+end_test