cwd=`pwd`
scripts/copy-test-confs
scripts/cleanup
+#
+# Note, we save the weird-files directory twice on purpose
+# because this causes problems with hard linked files
+# that are only saved once. In 1.33, Bacula now deals
+# with this situation.
+#
echo "${cwd}/weird-files" >/tmp/file-list
-bin/bacula stop 2>&1 >/dev/null
-cd bin
-./drop_bacula_tables >/dev/null 2>&1
-./make_bacula_tables >/dev/null 2>&1
-./grant_bacula_privileges 2>&1 >/dev/null
-cd ..
+echo "${cwd}/weird-files" >>/tmp/file-list
echo " "
echo " "
@# now do a restore
@#
@output tmp/log2.out
-restore where=${cwd}/tmp/bacula-restores select all storage=File
+restore where=${cwd}/tmp/bacula-restores select storage=File
+unmark *
+mark *
+done
yes
wait
messages
@output
quit
END_OF_DATA
+scripts/check_for_zombie_jobs storage=File
bin/bacula stop 2>&1 >/dev/null
-${cwd}/bin/testls weird-files >${cwd}/tmp/original
+${cwd}/bin/testls weird-files | sort >${cwd}/tmp/original
cd tmp/bacula-restores${cwd}
-${cwd}/bin/testls weird-files >${cwd}/tmp/restored
+${cwd}/bin/testls weird-files | sort >${cwd}/tmp/restored
cd ${cwd}
grep "^Termination: *Backup OK" tmp/log1.out 2>&1 >/dev/null
bstat=$?
echo " "
echo " !!!!! Weird files test failed!!! !!!!! "
echo " !!!!! Weird files test failed!!! !!!!! " >>test.out
+ if [ $bstat != 0 -o $rstat != 0 ] ; then
+ echo " !!!!! Bad Job termination status !!!!! "
+ echo " !!!!! Bad Job termination status !!!!! " >>test.out
+ else
+ echo " !!!!! Restored files differ !!!!! "
+ echo " !!!!! Restored files differ !!!!! " >>test.out
+ fi
echo " "
else
echo " ===== Weird files test OK ===== "