From: Amitay Isaacs <amitay@gmail.com>
Date: Thu, 23 Jan 2014 06:32:09 +0000 (+1100)
Subject: Replace tdb2 build with ntdb
X-Git-Url: http://git.samba.org/?p=build-farm.git;a=commitdiff_plain;h=605038a8d28f69273677ca05b2f4bfafab616581

Replace tdb2 build with ntdb

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/build_test.fns b/build_test.fns
index de2023e3..2cb46d3d 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 | ntdb | ldb | pidl | ccache* | waf*)
 			echo "git"
 				return 0
 			;;
@@ -255,7 +255,7 @@ do_make() {
 	MMTIME=$MAXTIME
 	# some trees don't need as much time
 	case "$tree" in
-		rsync | tdb* | talloc | libreplace | ccache* | waf*)
+		rsync | tdb | ntdb | talloc | libreplace | ccache* | waf*)
 			if [ "$compiler" != "checker" ]; then
 				MMTIME=`expr $MMTIME / 5`
 			fi
@@ -320,7 +320,7 @@ action_lcovreport() {
 		lorikeet-heimdal*)
 			lcov --directory $builddir --capture --output-file $builddir/$tree.lcov.info
 			;;
-		samba_4*|tdb*|talloc|ldb|libreplace)
+		samba_4*|tdb|ntdb|talloc|ldb|libreplace)
 			lcov --base-directory $builddir/bin --directory $builddir/bin --capture --output-file $builddir/$tree.lcov.info
 			;;
 		waf)
@@ -343,7 +343,7 @@ action_lcovreport() {
 action_callcatcherreport() {
 	if [ "$CALLCATCHER_REPORT" = "yes" ]; then
 		case "$tree" in
-		tdb*|talloc|ldb)
+		tdb|ntdb|talloc|ldb)
 			callanalyse `find $builddir/bin -name \*.so*` $builddir/bin/* > $builddir/coverage/unused-fns.txt
 			;;
 		samba_4*)
diff --git a/common.fns b/common.fns
index c25abf20..e983b39e 100644
--- a/common.fns
+++ b/common.fns
@@ -10,6 +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 ntdb . $compiler
 test_tree ldb . $compiler
 test_tree waf demos $compiler
diff --git a/web/trees.conf b/web/trees.conf
index 5be6cb8c..184fcb6c 100644
--- a/web/trees.conf
+++ b/web/trees.conf
@@ -54,11 +54,11 @@ repo = samba.git
 branch = master
 subdir = lib/tdb/
 
-[tdb2]
+[ntdb]
 scm = git
 repo = samba.git
 branch = master
-subdir = lib/tdb2/
+subdir = lib/ntdb/
 
 [ldb]
 scm = git