The branch, master has been updated
via 90b2a36 mark tdb2 as an old tree to delete
via 605038a Replace tdb2 build with ntdb
from 9c3d6e3 Revert "Add --without-gettext to restore Samba build on
hpisgr8"
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 90b2a36f8fbe95203d7793e072a4d0115b920481
Author: Andrew Bartlett <[email protected]>
Date: Thu Jan 23 20:46:20 2014 +1300
mark tdb2 as an old tree to delete
Signed-off-by: Andrew Bartlett <[email protected]>
commit 605038a8d28f69273677ca05b2f4bfafab616581
Author: Amitay Isaacs <[email protected]>
Date: Thu Jan 23 17:32:09 2014 +1100
Replace tdb2 build with ntdb
Signed-off-by: Amitay Isaacs <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
build_test.fns | 10 +++++-----
common.fns | 2 +-
web/trees.conf | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/build_test.fns b/build_test.fns
index de2023e..1f00620 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*)
@@ -1046,7 +1046,7 @@ per_run_hook() {
old_trees="web popt distcc samba-gtk smb-build lorikeet-heimdal
samba_3_2"
old_trees="$old_tree samba_3_2_test samba4 samba_4_0_waf
samba_4_0_waf.metze"
- old_trees="$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel
samba_3_waf samba_3_master"
+ old_trees="$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel
samba_3_waf samba_3_master tdb2"
for d in $old_trees; do
delete_old_tree $d
done
diff --git a/common.fns b/common.fns
index c25abf2..e983b39 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 5be6cb8..184fcb6 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
--
build.samba.org
