Merge branch 'master' into basejobv3

[bacula/bacula] / regress / tests / accurate-test

diff --git a/regress/tests/accurate-test b/regress/tests/accurate-test
index 80168c8b4be86f47fe11df7b2c93e10b66d80fb3..cab181c7f37c2df5a099f7c2ce97a3e33bd9d7ef 100755 (executable)
--- a/regress/tests/accurate-test
+++ b/regress/tests/accurate-test
@@ -11,14 +11,14 @@
 TestName="accurate-test"
 JobName=backup
 . scripts/functions
-scripts/cleanup
+$rscripts/cleanup
 
 copy_test_confs
-/bin/cp -f scripts/bacula-dir.conf.accurate bin/bacula-dir.conf
-sed s/all,/all,saved,/ bin/bacula-fd.conf > tmp/1
-cp tmp/1 bin/bacula-fd.conf
+cp -f $rscripts/bacula-dir.conf.accurate $conf/bacula-dir.conf
+sed s/all,/all,saved,/ $conf/bacula-fd.conf > tmp/1
+cp tmp/1 $conf/bacula-fd.conf
 
-change_jobname Client1 $JobName
+change_jobname BackupClient1 $JobName
 
 p() {
     echo "##############################################" >> ${cwd}/tmp/log1.out
@@ -33,8 +33,8 @@ rm -rf ${cwd}/build/accurate
 
 
 # add extra files
-mkdir ${cwd}/build/accurate
-mkdir ${cwd}/build/accurate/dirtest
+mkdir -p ${cwd}/build/accurate
+mkdir -p ${cwd}/build/accurate/dirtest
 echo "test test" > ${cwd}/build/accurate/dirtest/hello
 echo "test test" > ${cwd}/build/accurate/xxx
 echo "test test" > ${cwd}/build/accurate/yyy
@@ -50,7 +50,7 @@ echo ${cwd}/build > ${cwd}/tmp/file-list
 start_test
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
-@output /dev/null
+@$out /dev/null
 messages
 label volume=TestVolume001 storage=File pool=Default
 messages
@@ -72,7 +72,6 @@ restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -164,9 +163,10 @@ rm -rf ${cwd}/tmp/bacula-restores
 p Check with bls
 ################################################################
 
-$bin/bls -c bin/bacula-sd.conf -V 'TestVolume001' FileStorage > tmp/bls.out
-grep -- '----' tmp/bls.out | grep xxx > /dev/null
+$bin/bls -c $conf/bacula-sd.conf -V 'TestVolume001' FileStorage > $tmp/bls.out
+grep -- '----' $tmp/bls.out | grep xxx > /dev/null
 if [ $? != 0 ] ; then
+    print_debug "ERROR: Should find deleted files into $tmp/bls.out"
     bstat=2
 fi
 
@@ -203,7 +203,6 @@ restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -236,7 +235,6 @@ restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -280,7 +278,7 @@ p Check with bscan
 
 stop_bacula
 
-cd ${cwd}/bin
+cd $bin
   ./drop_bacula_tables      >/dev/null 2>&1
   ./make_bacula_tables      >/dev/null 2>&1
   ./grant_bacula_privileges >/dev/null 2>&1
@@ -290,7 +288,7 @@ echo "volume=TestVolume001" >tmp/bscan.bsr
 
 bscan_libdbi
 
-$bin/bscan -c bin/bacula-sd.conf $BSCANLIBDBI -n regress -u regress -m -s -b tmp/bscan.bsr FileStorage 2>&1 > ${cwd}/tmp/bscan.log
+$bin/bscan -c $conf/bacula-sd.conf $BSCANLIBDBI -n regress -u regress -m -s -b $tmp/bscan.bsr FileStorage 2>&1 > $tmp/bscan.log
 
 cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out ${cwd}/tmp/log1.out
@@ -304,7 +302,6 @@ restore fileset=FS_TESTJOB where=${cwd}/tmp/bacula-restores select all done
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -337,7 +334,6 @@ restore fileset=FS_TESTJOB_ADVANCE where=${cwd}/tmp/bacula-restores select all d
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -370,7 +366,6 @@ restore fileset=FS_TESTJOB_ADVANCE where=${cwd}/tmp/bacula-restores select all d
 yes
 wait
 messages
-@$out
 quit
 END_OF_DATA
 
@@ -418,13 +413,13 @@ run_bconsole
 
 grep yyy ${cwd}/tmp/log3.out > /dev/null
 if [ $? != 0 ] ; then
-    print_debug "Can't find yyy file into 'list files' output (${cwd}/tmp/log3.out)"
+    print_debug "ERROR: Can't find yyy file into 'list files' output (${cwd}/tmp/log3.out)"
     dstat=2
 fi
 
-if grep zzz ${cwd}/tmp/log3.out > /dev/null
-then
-    print_debug "Can't find zzz file into 'list files' output (${cwd}/tmp/log3.out)"
+grep zzz ${cwd}/tmp/log3.out > /dev/null
+if [ $? = 0 ] ; then
+    print_debug "ERROR: Should not find zzz file into 'list files' output (${cwd}/tmp/log3.out)"
     dstat=2
 fi