Add tdb2 build

diff --git a/build_test.fns b/build_test.fns
index 50ab43c4b7b795864be817baac10eb88358d33ad..392180a6280a1971b3c33b833241d0ec0b9debbc 100644 (file)
--- 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 87fe12d99c2031cce32c4d8ce93209ef3f33ebd0..c25abf202f09ea96c7fd69084dc0405745ad348b 100644 (file)
--- 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 204bed652ec74c7b866370465a90e936abca4cc3..47ae2d6ed66302690a6a483347a84945cd2abc63 100644 (file)
--- 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 bfa4c0373576557fcb4a320538e3755bc21331a2..a0fa1386103bab8bde413d5585441d10aeb9fed0 100644 (file)
--- 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