From: Björn Jacke <bj@sernet.de>
Date: Wed, 17 Sep 2014 15:42:06 +0000 (+0200)
Subject: update and rename buildfarm branches
X-Git-Url: http://git.samba.org/?p=build-farm.git;a=commitdiff_plain;h=942ce41e5b8e617155ac80340b631819ff409095

update and rename buildfarm branches

samba_4_0_test -> samba_master
samba_3_current > samba_current (now set to v4-1-test)
samba_3_next > samba_next (now set to v4-2-test)
---

diff --git a/build_test.fns b/build_test.fns
index 1f006200..2d45fb4f 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -1047,6 +1047,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 tdb2"
+	old_trees="$old_tree samba_3_current samba_3_next samba_4_0_test"
 	for d in $old_trees; do
 		delete_old_tree $d
 	done
diff --git a/generic.fns b/generic.fns
index 74e1a677..97937a7a 100644
--- a/generic.fns
+++ b/generic.fns
@@ -46,7 +46,6 @@ for compiler in $compilers; do
 
     TDB_NO_FSYNC=1
     export TDB_NO_FSYNC
-    test_tree samba_4_0_test . $compiler
     TDB_NO_FSYNC=0
     export TDB_NO_FSYNC
 
@@ -61,8 +60,9 @@ for compiler in $compilers; do
 
       TDB_NO_FSYNC=1
       export TDB_NO_FSYNC
-      test_tree samba_3_current source3 $compiler
-      test_tree samba_3_next source3 $compiler
+      test_tree samba_current . $compiler
+      test_tree samba_next . $compiler
+      test_tree samba_master . $compiler
       TDB_NO_FSYNC=0
       export TDB_NO_FSYNC
 
diff --git a/web/trees.conf b/web/trees.conf
index 184fcb6c..1b0af007 100644
--- a/web/trees.conf
+++ b/web/trees.conf
@@ -18,19 +18,19 @@ scm = git
 repo = samba-web.git
 branch = trunk
 
-[samba_3_current]
+[samba_current]
 scm = git
 repo = samba.git
-branch = v3-5-test
-srcdir = source3
+branch = v4-1-test
+srcdir = .
 
-[samba_3_next]
+[samba_next]
 scm = git
 repo = samba.git
-branch = v3-6-test
-srcdir = source3
+branch = v4-2-test
+srcdir = .
 
-[samba_4_0_test]
+[samba_master]
 scm = git
 repo = samba.git
 branch = master