From: Kern Sibbald <kern@sibbald.com>
Date: Fri, 23 Mar 2007 21:23:33 +0000 (+0000)
Subject: Update
X-Git-Tag: Release-7.0.0~6727
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=99e72c3683e57a9aa4d292eabf706a790c8a0b9e;p=bacula%2Fbacula

Update

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@4398 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/regress/kern.conf b/regress/kern.conf
index 0839ca77bf..15512ce3b2 100644
--- a/regress/kern.conf
+++ b/regress/kern.conf
@@ -1,5 +1,5 @@
 # Where to get the source to be tested
-#BACULA_SOURCE="${HOME}/bacula/branch-2.0"
+#BACULA_SOURCE="${HOME}/bacula/bacula/branch-2.0"
 BACULA_SOURCE="${HOME}/bacula/k"
 
 # Where to send email   !!!!! Change me !!!!!!!
@@ -20,8 +20,8 @@ TAPE_DRIVE1="/dev/null"
 AUTOCHANGER_PATH="/usr/sbin/mtx"
 
 # Set your database here
-WHICHDB="--with-sqlite=${SQLITE_DIR}"
-#WHICHDB="--with-mysql"
+#WHICHDB="--with-sqlite=${SQLITE_DIR}"
+WHICHDB="--with-mysql"
 #WHICHDB="--with-postgresql"
 
 # Set this to "--with-tcp-wrappers" or "--without-tcp-wrappers"
diff --git a/regress/tests/incremental-2disk b/regress/tests/incremental-2disk
index a2227f79bb..7f99654e19 100755
--- a/regress/tests/incremental-2disk
+++ b/regress/tests/incremental-2disk
@@ -89,4 +89,18 @@ rm -f 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 tmp/log1.out
+   echo "  "
+   cat tmp/log2.out
+   echo "  "
+   diff -r tmp/build tmp/bacula-restores${cwd}/tmp/build
+fi
+
 end_test