cmake first try

DartConfiguration.tcl.in

@@ -1,7 +1,7 @@
 SourceDirectory: @srcdir@
 BuildDirectory: @regressdir@
 Site: @sitename@
-BuildName: @bversion@-@bdate@-@dbengine@-@os@
+BuildName: @bversion@-@bareos_gitrev@-@bdate@-@dbengine@-@os@-@regress_gitrev@
 DropMethod: http
 DropSite: regress.bareos.org
 DropLocation: /submit.php?project=bareos

scripts/create_sed

@@ -34,8 +34,23 @@ bdate=`sed -n -e 's/^.*LSMDATE.*"\(.*\)"$/\1/p' ${srcdir}/src/include/version.h`
 builddir="${src}"
 hostname="${hostname:-$HOST}"
 
+# get git info
+regress_gitrev=""
+bareos_gitrev=""
+
+pushd $cwd
+regress_gitrev=`git show -s --format=%h HEAD`
+popd
+
+pushd ${BAREOS_SOURCE}
+bareos_gitrev=`git show -s --format=%h HEAD`
+popd
+
+
 # Create sed command script
 >${out}
+echo "s%@bareos_gitrev@%${bareos_gitrev}%g" >>${out}
+echo "s%@regress_gitrev@%${regress_gitrev}%g" >>${out}
 echo "s%@archivedir@%${tmp}%g" >>${out}
 echo "s%@bindir@%${bin}%g" >>${out}
 echo "s%@sbindir@%${bin}%g" >>${out}

scripts/functions

@@ -235,9 +235,9 @@ run_bareos()
    zstat=0
    estat=0
    if test "$debug" -eq 1 ; then
-     ${scripts}/bareos-ctl-dir start -m
-     ${scripts}/bareos-ctl-sd start -m
-     ${scripts}/bareos-ctl-fd start -m $1
+     ${scripts}/bareos-ctl-dir start -m -d 100
+     ${scripts}/bareos-ctl-sd start -m -d 100
+     ${scripts}/bareos-ctl-fd start -m $1 -d 100
    else
      ${scripts}/bareos start >/dev/null 2>&1
    fi

scripts/regress-config.in

@@ -4,6 +4,7 @@
 #
 
 . ${1}/config
+
 if test "x@db_password@" = "x"; then
   PASSWD=
 else
@@ -31,6 +32,7 @@ cmake  .. \
     -Dsbindir=${1}/bin \
     -Dlibdir=${1}/bin \
     -Dsysconfdir=${1}/bin \
+    -Dscriptdir=${1}/bin \
     -Dconfdir=${1}/bin \
     -Dmandir=${1}/bin \
     -Ddocdir=${1}/bin/html \
@@ -42,13 +44,13 @@ cmake  .. \
     -Dsmartalloc=yes\
     -Dlockmgr=yes \
     -Dconio=no \
-    -Dworking-dir=${1}/working \
+    -Dworking_dir=${1}/working \
     -Darchivedir=${1}/tmp \
-    -Ddump-email=${EMAIL} \
-    -Djob-email=${EMAIL} \
-    -Dsmtp-host=${SMTP_HOST} \
-    -Ddb-name=@db_name@ \
-    -Ddb-user=@db_user@ \
+    -Ddump_email=${EMAIL} \
+    -Djob_email=${EMAIL} \
+    -Dsmtp_host=${SMTP_HOST} \
+    -Ddb_name=@db_name@ \
+    -Ddb_user=@db_user@ \
     ${PASSWD} \
     ${OPENSSL} \
     ${TCPWRAPPERS} \
@@ -60,4 +62,5 @@ LD_LIBRARY_PATH=${1}/bin:${LD_LIBRARY_PATH}
 export LD_LIBRARY_PATH
 
 cd ..
+
 exit 0

scripts/setup

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 
 #
 # Script to setup running Bareos regression tests
@@ -80,12 +80,15 @@ rm -f Makefile config.*
 #
 # Run Bareos configuration, make, install
 #
-./regress-config ${cwd}
+sh -x ./regress-config ${cwd}
 check_exit_code
 
 #
 # Cleanup any build in source
 #
+
+cd cmake-build
+
 make clean
 make ${MAKEOPT}
 check_exit_code
@@ -101,23 +104,24 @@ fi
 #
 # Get all tests -- especially testls
 #
-cd src/tests
-make installall
-check_exit_code
-cd ../..
+#cd src/tests
+#make installall
+#check_exit_code
+#cd ../..
 
 #
 # Get all tools -- especially timelimit
 #
-cd src/tools
-make installall
-check_exit_code
-cd ../..
+#cd src/tools
+#make installall
+#check_exit_code
+#cd ../..
+
 # make -C not available on Solaris, therefore cd in subshell.
-(
-  cd src/plugins/filed
-  make install-test-plugin
-)
+#(
+#  cd src/plugins/filed
+#  make install-test-plugin
+#)
 #disable test-plugin
 mv ${cwd}/bin/plugins/test-plugin-fd.so ${cwd}/bin/plugins/test-plugin-fd.sox
 

tests/bscan-test

@@ -66,12 +66,15 @@ else
   PASSWD="-P ${db_password}"
 fi
 
+debug=1
 if test "$debug" -eq 1 ; then
   $bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr ${cwd}/tmp
 else
   $bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr ${cwd}/tmp >tmp/log3.out 2>&1
 fi
 
+echo "$bin/bscan -w working $BSCANLIBDBI -u ${db_user} -n ${db_name} $PASSWD -m -s -v -b tmp/bscan.bsr ${cwd}/tmp "
+
 cat <<END_OF_DATA >tmp/bconcmds
 @$out /dev/null
 messages