From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 16 Jul 2009 13:48:33 +0000 (+0000)
Subject: Use BUILD_DIR in default conf
X-Git-Tag: Release-3.0.2~39
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=82bb24bf6703398a8b3460285634e186682ad382;p=bacula%2Fbacula

Use BUILD_DIR in default conf

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

diff --git a/regress/scripts/functions b/regress/scripts/functions
index aae48d2a01..329403c9e0 100644
--- a/regress/scripts/functions
+++ b/regress/scripts/functions
@@ -279,6 +279,17 @@ check_restore_diff()
    dstat=$?
 }
 
+check_restore_bin_diff()
+{
+   if test "$debug" -eq 1 ; then
+      diff -ur ${bin} ${tmp}/bacula-restores${bin}
+   else 
+      diff -ur ${bin} ${tmp}/bacula-restores${bin} 2>&1 >/dev/null
+   fi
+   dstat=$?
+}
+
+
 check_restore_tmp_build_diff()
 {
    if test "$debug" -eq 1 ; then
diff --git a/regress/scripts/setup b/regress/scripts/setup
index 7ec5138347..6013db2fca 100755
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -25,11 +25,15 @@ rm -rf build bin
 # Copy new source
 echo "Copying source from ${BACULA_SOURCE}"
 cp -rp ${BACULA_SOURCE} build
-cd build
-rm -rf txt src/testprogs
-cd ..
-check_exit_code
 scripts/create_sed
+# In default bacula-dir.conf.in, change default file 
+# to backup to be build directory
+echo "s%File = @sbindir@%File = @BUILD_DIR@%g" >tmp/t$$
+sed -f tmp/t$$ build/src/dird/bacula-dir.conf.in >tmp/o$$
+cp tmp/o$$ build/src/dird/bacula-dir.conf.in
+rm -f tmp/t$$ tmp/o$$
+# remove unneeded directories
+rm -rf build/txt build/src/testprogs
 sed -f tmp/sed_tmp scripts/regress-config.in >scripts/regress-config
 chmod 755 scripts/regress-config
 cp scripts/regress-config build