X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbsr-opt-test;h=9413a8c081fcbd344020433bb8ac0e33c8e0098e;hb=1e11e29bf661a26cef2419a31d82b6657370f0af;hp=c8126136104ff233a7d8e08cb6bfd9977a159db1;hpb=746d82a8a9073a8f8093fa611d02cddc192f8936;p=bacula%2Fbacula

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index c812613610..9413a8c081 100755
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -6,38 +6,31 @@
 #   the other volume is not used.  I.e. bsr optimization
 #   works.
 #
-debug=0
-if test "$debug" -eq 1 ; then
-  out="tee"
-else
-  out="output"
-fi
+TestName="bsr-opt-test"
+JobName=bsr-opt
+. scripts/functions
 
-cwd=`pwd`
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
-echo " "
-echo " "
-echo " === Starting bsr-opt-test at `date +%R:%S` ==="
-echo " === Starting bsr-opt-test at `date +%R:%S` ===" >working/log
-echo " "
+change_jobname NightlySave $JobName
+start_test
 
-cat <<END_OF_DATA >tmp/bconcmds
+cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
-@$out tmp/log1.out
+@$out ${cwd}/tmp/log1.out
 label storage=File1 volume=TestVolume001
 label storage=File1 volume=TestVolume002
 update Volume=TestVolume001 MaxVolBytes=3000000
-run job=NightlySave storage=File1 yes
+run job=$JobName storage=File1 yes
 wait
 messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
 restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 cd ${cwd}/build/src/cats
@@ -51,16 +44,9 @@ messages
 quit
 END_OF_DATA
 
-if test "$debug" -eq 1 ; then
-  bin/bacula start
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf
-else
-  bin/bacula start 2>&1 >/dev/null
-  cat tmp/bconcmds | bin/bconsole -c bin/bconsole.conf  2>&1 >/dev/null
-fi
-
-scripts/check_for_zombie_jobs storage=File1
-bin/bacula stop 2>&1 >/dev/null
+run_bacula
+check_for_zombie_jobs storage=File1
+stop_bacula
 #
 # This test is not really reliable. What we want to do is
 #   to select files on only one Volume, then insure here
@@ -68,11 +54,9 @@ bin/bacula stop 2>&1 >/dev/null
 #
 grep TestVolume002 working/restore.bsr 2>&1 >/dev/null
 bsrstat=$?
-grep "^  Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
-bstat=$?
-grep "^  Termination: *Restore OK" tmp/log2.out 2>&1 >/dev/null
-rstat=$?
-diff -r build/src/cats  tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null
+check_two_logs
+
+diff -r build/src/cats  ${cwd}/tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null
 if [ $? != 0 -o $bsrstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
    echo " "
    echo " "