From f7032a01dd0e4babf45ddaf0d02ea3992cad2061 Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 12 Oct 2008 19:33:44 +0000 Subject: [PATCH] Convert to new CDart git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/branches/Branch-2.4@7772 91ce42f0-d328-0410-95d8-f526ca767f89 --- regress/DartConfiguration.tcl.in | 10 ++++++---- regress/scripts/create_sed | 11 +++++++++-- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/regress/DartConfiguration.tcl.in b/regress/DartConfiguration.tcl.in index ededd963b2..ca4bd1ff2f 100644 --- a/regress/DartConfiguration.tcl.in +++ b/regress/DartConfiguration.tcl.in @@ -1,10 +1,12 @@ SourceDirectory: @srcdir@ BuildDirectory: @regressdir@ Site: @sitename@ -BuildName: bacula-@bversion@-@bdate@-@dbengine@-@os@ -DropMethod: xmlrpc -DropSite: http://regress.bacula.org:8081 -DropLocation: Bacula +BuildName: @bversion@-@bdate@-@dbengine@-@os@ +DropMethod: http +DropSite: regress.bacula.org +DropLocation: /submit.php?project=bacula +DroptSiteCdash: true +TriggerSite: http://regress.bacula.org NightlyStartTime: 23:00:00 CET MakeCommand: @regressdir@/scripts/update-ctest ConfigureCommand: true diff --git a/regress/scripts/create_sed b/regress/scripts/create_sed index 350a31a2ea..4683303a79 100755 --- a/regress/scripts/create_sed +++ b/regress/scripts/create_sed @@ -3,7 +3,7 @@ # Create the sed file for configuring everything # cwd=`pwd` -. ${cwd}/config +. ${cwd}/scripts/functions mkdir -p ${cwd}/bin mkdir -p ${cwd}/tmp out="${cwd}/tmp/sed_tmp" @@ -20,10 +20,16 @@ sdport=`expr ${BASEPORT} '+' 2` db_name=${db_name:-"regress"} db_user=${db_user:-"regress"} db_password=${db_password:-""} -os=`uname -s`-`./scripts/get-os` +# Drop Linux from OS to shorten name +if test `uname -s` = "Linux"; then + os=`./scripts/get-os` +else + os=`uname -s`-`./scripts/get-os` +fi 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` +builddir="${cwd}/build" # Create sed command script echo "s%@sbindir@%${cwd}/bin%g" >${out} @@ -71,3 +77,4 @@ echo "s%@win32_password@%${WIN32_PASSWORD}%g" >>${out} echo "s%@db_name@%${db_name}%g" >>${out} echo "s%@db_user@%${db_user}%g" >>${out} echo "s%@db_password@%${db_password}%g" >>${out} +echo "s%@builddir@%${builddir}%g" >>${out} -- 2.39.5