X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Fbsr-opt-test;h=068ae1092734c2b7e1826831bd630f3d2edb88cd;hb=c0aaad2cbccdf8a49448666d2ba89ca4fe531ec9;hp=e4ca9a31575df86d3c6cd7326667feda805c45b9;hpb=5b4f40e5baaa8cbba795741f60488e464fddea1e;p=bacula%2Fbacula

diff --git a/regress/tests/bsr-opt-test b/regress/tests/bsr-opt-test
index e4ca9a3157..068ae10927 100755
--- a/regress/tests/bsr-opt-test
+++ b/regress/tests/bsr-opt-test
@@ -9,20 +9,18 @@
 TestName="bsr-opt-test"
 JobName=bsr-opt
 . scripts/functions
-set_debug 0
 
-scripts/copy-test-confs
 scripts/cleanup
-echo "${cwd}/build" >/tmp/file-list
-
-change_jobname $JobName
+scripts/copy-test-confs
+echo "${cwd}/build" >${cwd}/tmp/file-list
 
+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
@@ -32,7 +30,8 @@ messages
 @# 
 @# now do a restore
 @#
-@$out tmp/log2.out
+@$out ${cwd}/tmp/log2.out
+setdebug level=150 storage=File1
 restore bootstrap=${cwd}/working/restore.bsr where=${cwd}/tmp/bacula-restores select storage=File1
 unmark *
 cd ${cwd}/build/src/cats
@@ -58,7 +57,7 @@ grep TestVolume002 working/restore.bsr 2>&1 >/dev/null
 bsrstat=$?
 check_two_logs
 
-diff -r build/src/cats  tmp/bacula-restores${cwd}/build/src/cats 2>&1 >/dev/null
+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 " "
@@ -75,6 +74,7 @@ if [ $? != 0 -o $bsrstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
       echo "  !!!!! Restored files differ          !!!!! " >>test.out
    fi
    echo " "
+   exit 1
 else
    echo "  ===== bsr-opt-test Bacula source OK `date +%R:%S` ===== "
    echo "  ===== bsr-opt-test OK `date +%R:%S` ===== " >>test.out