Some tweaks

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

diff --git a/regress/DartConfiguration.tcl.in b/regress/DartConfiguration.tcl.in
index fe3222dd9131c6fb29de664bdb33b801e56b184c..0bb5988b5cf109e9d97ae94c48a163187c407b4d 100644 (file)
--- a/regress/DartConfiguration.tcl.in
+++ b/regress/DartConfiguration.tcl.in
@@ -1,7 +1,7 @@
 SourceDirectory: @srcdir@
 BuildDirectory: @regressdir@
 Site: @sitename@
-BuildName: bacula-@os@-@dbengine@
+BuildName: bacula-@bversion@-@bdate@-@os@-@dbengine@
 DropMethod: xmlrpc
 DropSite: http://baculadart.wpi.edu:8081
 DropLocation: Bacula

diff --git a/regress/nightly-all b/regress/nightly-all
index 153b4002eedb12fe82f70327f7b9a6e5940f118f..d2918ca9c3c94e230afd9843bd1a252aa7df6e89 100755 (executable)
--- a/regress/nightly-all
+++ b/regress/nightly-all
@@ -2,4 +2,8 @@
 #
 # run both the disk and the tape based regression tests.
 #
+# Include full output
+REGRESS_DEBUG=1
+export REGRESS_DEBUG
+scripts/do_sed
 ctest -D Nightly -R "all-non-root.*"

diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index 91c0280d7cb1f67e58d6a5e67b5d7f52aa89b3c3..5bba66be4abf5b0d30f3a3dfd499af79a59271d9 100755 (executable)
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -7,12 +7,14 @@ out="${cwd}/tmp/sed_tmp"
 
 # set the ports used by these tests
 BASEPORT=${BASEPORT:-8101}
+srcdir=${BACULA_SOURCE}
 dirport=${BASEPORT}
 fdport=`expr ${BASEPORT} '+' 1`
 sdport=`expr ${BASEPORT} '+' 2`
 os=`uname -s`
-
 dbengine=`echo ${WHICHDB} | sed -e 's/--with-//' -e 's/=.*//'`
+bversion=`sed -n -e 's/^.*VERSION.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
+bdate=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/version.h`
 
 # Create sed command script
 echo "s%@sbindir@%${cwd}/bin%g" >${out}
@@ -45,9 +47,12 @@ echo "s%@sdport@%${sdport}%g" >>${out}
 echo "s%@fdport@%${fdport}%g" >>${out}
 echo "s%@regressdir@%${cwd}%g" >>${out}
 echo "s%@dbengine@%${dbengine}%g" >>${out}
-echo "s%@srcdir@%${BACULA_SOURCE}%g" >>${out}
+echo "s%@srcdir@%${srcdir}%g" >>${out}
 echo "s%@sitename@%${SITE_NAME}%g" >>${out}
 echo "s%@os@%${os}%g" >>${out}
+echo "s%@bversion@%${bversion}%g" >>${out}
+echo "s%@bdate@%${bdate}%g" >>${out}
+
 
 # process .in files with sed script
 sed -f ${out} ${cwd}/scripts/bacula-dir.conf.errors.in >${cwd}/scripts/bacula-dir.conf.errors