[SCM] build.samba.org - branch master updated

Andrew Bartlett abartlet at samba.org
Thu Mar 8 19:24:39 MST 2012


The branch, master has been updated
       via  87b42eb Add tdb2 build
      from  1174b9f add per_run_hook and global_lock to coverage.fns

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 87b42eba624bdd267c8d3bce3dbb6dbfd941f629
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Wed Mar 7 10:03:34 2012 +1100

    Add tdb2 build

-----------------------------------------------------------------------

Summary of changes:
 build_test.fns |    8 ++++----
 common.fns     |    1 +
 snab.fns       |    2 +-
 web/trees.conf |    6 ++++++
 4 files changed, 12 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/build_test.fns b/build_test.fns
index 50ab43c..392180a 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -164,7 +164,7 @@ choose_scm() {
 	tree=$1
 
 	case "$tree" in
-			samba* | rsync | libreplace | talloc | tdb | ldb | pidl | ccache* | waf*)
+			samba* | rsync | libreplace | talloc | tdb* | ldb | pidl | ccache* | waf*)
 			echo "git"
 				return 0
 			;;
@@ -253,7 +253,7 @@ do_make() {
 	MMTIME=$MAXTIME
 	# some trees don't need as much time
 	case "$tree" in
-		rsync | tdb | talloc | libreplace | ccache* | waf*)
+		rsync | tdb* | talloc | libreplace | ccache* | waf*)
 			if [ "$compiler" != "checker" ]; then
 				MMTIME=`expr $MMTIME / 5`
 			fi
@@ -321,7 +321,7 @@ action_lcovreport() {
 		samba_3_master*)
 			lcov --base-directory $builddir --directory $builddir/.. --capture --output-file $builddir/$tree.lcov.info
 			;;
-		samba_4*|tdb|talloc|ldb|libreplace)
+		samba_4*|tdb*|talloc|ldb|libreplace)
 			lcov --base-directory $builddir/bin --directory $builddir/bin --capture --output-file $builddir/$tree.lcov.info
 			;;
 		waf)
@@ -344,7 +344,7 @@ action_lcovreport() {
 action_callcatcherreport() {
 	if [ "$CALLCATCHER_REPORT" = "yes" ]; then
 		case "$tree" in
-		tdb|talloc|ldb)
+		tdb*|talloc|ldb)
 			callanalyse `find $builddir/bin -name \*.so*` $builddir/bin/* > $builddir/coverage/unused-fns.txt
 			;;
 		samba_3_master|samba_4*)
diff --git a/common.fns b/common.fns
index 87fe12d..c25abf2 100644
--- a/common.fns
+++ b/common.fns
@@ -10,5 +10,6 @@ test_tree ccache . $compiler
 test_tree ccache-maint . $compiler
 test_tree talloc . $compiler
 test_tree tdb . $compiler
+test_tree tdb2 . $compiler
 test_tree ldb . $compiler
 test_tree waf demos $compiler
diff --git a/snab.fns b/snab.fns
index 204bed6..47ae2d6 100644
--- a/snab.fns
+++ b/snab.fns
@@ -14,7 +14,7 @@ for d in samba_3_current samba_3_next samba_3_master; do
     test_tree $d source checker configure config_log config_header build cc_checker install test
 done
 
-for d in ldb tdb talloc libreplace lorikeet-heimdal ccache rsync; do
+for d in ldb tdb tdb2 talloc libreplace lorikeet-heimdal ccache rsync; do
     export CFLAGS="$CHECK_FLAGS --beam::data=/home/tridge/beam/$d"
     mkdir -p /home/tridge/beam/$d
     test_tree $d . checker configure config_log config_header build cc_checker install test
diff --git a/web/trees.conf b/web/trees.conf
index bfa4c03..a0fa138 100644
--- a/web/trees.conf
+++ b/web/trees.conf
@@ -60,6 +60,12 @@ repo = samba.git
 branch = master
 subdir = lib/tdb/
 
+[tdb2]
+scm = git
+repo = samba.git
+branch = master
+subdir = lib/tdb2/
+
 [ldb]
 scm = git
 repo = samba.git


-- 
build.samba.org


More information about the samba-cvs mailing list