-rm -f tmp/build/*.c
-diff -r tmp/build tmp/bacula-restores${cwd}/tmp/build 2>&1 >/dev/null
-if [ $? != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
- echo " "
- echo " "
- echo " !!!!! incremental-2disk test Bacula source failed!!! !!!!! "
- echo " !!!!! incremental-2disk test failed!!! !!!!! " >>test.out
- echo " "
-else
- echo " ===== incremental-2disk test Bacula source OK ===== "
- echo " ===== incremental-2disk test OK ===== " >>test.out
- scripts/cleanup
+rm -f ${cwd}/tmp/build/*.c
+
+check_two_logs
+check_restore_tmp_build_diff
+
+#
+# This script seems to more or less randomly fail, so we
+# add extra code here to produce a "dump" in the event of
+# an error.
+#
+if [ $dstat != 0 -o $bstat != 0 -o $rstat != 0 ] ; then
+ cat ${cwd}/tmp/log1.out
+ echo " "
+ cat ${cwd}/tmp/log2.out
+ echo " "
+ diff -r ${cwd}/tmp/build ${cwd}/tmp/bacula-restores${cwd}/tmp/build