From: Kern Sibbald Date: Fri, 20 Jun 2008 17:18:14 +0000 (+0000) Subject: Fix problem with regress-config not properly created X-Git-Tag: Release-3.0.0~1264 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1b5db12deab370d043e4bb7d70c95bea1406b128;p=bacula%2Fbacula Fix problem with regress-config not properly created git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7197 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/regress/Makefile b/regress/Makefile index 7cd8d895a3..4523db35b8 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -28,6 +28,7 @@ bacula: all @rm -f w.tar.gz w.tar @rm -rf tmp working mkdir tmp working + scripts/create_sed echo "Doing: scripts/setup" scripts/setup diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed index ab5e7ed27d..3fb34ff9e8 100755 --- a/regress/scripts/do_sed +++ b/regress/scripts/do_sed @@ -58,7 +58,7 @@ sed -f ${out} ${cwd}/scripts/bacula-sd-2d.conf.in >${cwd}/scripts/bacula-sd-2d.c sed -f ${out} ${cwd}/scripts/bacula-dir-2d.conf.in >${cwd}/scripts/bacula-dir-2d.conf sed -f ${out} ${cwd}/scripts/bconsole-2d.conf.in >${cwd}/scripts/bconsole-2d.conf sed -f ${out} ${cwd}/scripts/regress-config.in >${cwd}/scripts/regress-config - +chmod 755 ${cwd}/scripts/regress-config scripts/config_dart diff --git a/regress/scripts/regress-config.in b/regress/scripts/regress-config.in old mode 100644 new mode 100755 diff --git a/regress/scripts/setup b/regress/scripts/setup index d9dc1533ec..4a6e81b2c9 100755 --- a/regress/scripts/setup +++ b/regress/scripts/setup @@ -19,10 +19,14 @@ if [ ! -d ${BACULA_SOURCE} ] ; then echo " " exit 1 fi + rm -rf build bin # Copy new source echo "Copying source from ${BACULA_SOURCE}" cp -rp ${BACULA_SOURCE} build +scripts/create_sed +sed -f tmp/sed_tmp scripts/regress-config.in >scripts/regress-config +chmod 755 scripts/regress-config cp scripts/regress-config build cd build rm -f Makefile config.cache