From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 7 Jan 2014 00:44:54 +0000 (+1300)
Subject: remove all references to samba_3_master and mark as a removed tree
X-Git-Url: http://git.samba.org/?p=build-farm.git;a=commitdiff_plain;h=5deb0c12b8667d057bb329eac4d9ead5aa73c5d8

remove all references to samba_3_master and mark as a removed tree
---

diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 94758987..cdcb6cb3 100644
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -19,7 +19,6 @@ for compiler in $compilers; do
 
 	test_tree samba_3_current source3 $compiler
 	test_tree samba_3_next source3 $compiler
-	test_tree samba_3_master source3 $compiler
 done
 
 global_unlock
diff --git a/SerNet-aix.fns b/SerNet-aix.fns
index 82009766..6ed481ab 100644
--- a/SerNet-aix.fns
+++ b/SerNet-aix.fns
@@ -13,7 +13,6 @@ compiler="cc"
 test_tree lorikeet-heimdal . $compiler
 test_tree samba_3_current source3 $compiler
 test_tree samba_3_next source3 $compiler
-test_tree samba_3_master source3 $compiler
 test_tree pidl . cc build test
 
 compiler="xlc_r"
diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index 66464f4c..0788ce8e 100644
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -37,7 +37,6 @@ for compiler in $compilers; do
 	test_tree samba_4_0_test . $compiler
 	test_tree samba_3_current source3 $compiler
 	test_tree samba_3_next source3 $compiler
-	test_tree samba_3_master source3 $compiler
 	TDB_NO_FSYNC=0
 	export TDB_NO_FSYNC
 done
diff --git a/build_test.fns b/build_test.fns
index ded4d098..de2023e3 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -320,9 +320,6 @@ action_lcovreport() {
 		lorikeet-heimdal*)
 			lcov --directory $builddir --capture --output-file $builddir/$tree.lcov.info
 			;;
-		samba_3_master*)
-			lcov --base-directory $builddir --directory $builddir/.. --capture --output-file $builddir/$tree.lcov.info
-			;;
 		samba_4*|tdb*|talloc|ldb|libreplace)
 			lcov --base-directory $builddir/bin --directory $builddir/bin --capture --output-file $builddir/$tree.lcov.info
 			;;
@@ -349,7 +346,7 @@ action_callcatcherreport() {
 		tdb*|talloc|ldb)
 			callanalyse `find $builddir/bin -name \*.so*` $builddir/bin/* > $builddir/coverage/unused-fns.txt
 			;;
-		samba_3_master|samba_4*)
+		samba_4*)
 			callanalyse `find $builddir/bin -name \*.so*` $builddir/bin/* > $builddir/coverage/all-unused-fns.txt 
 			grep -v -f $srcdir/callcatcher-exceptions.grep $builddir/coverage/all-unused-fns.txt > $builddir/coverage/unused-fns.txt
 			;;
@@ -756,9 +753,6 @@ test_tree() {
 	samba_4*)
 		sw_config="$config --enable-selftest"
 		;;
-	samba_3_master)
-		sw_config="$config --enable-selftest"
-		;;
 	samba_3*)
 		sw_config="$config --enable-socket-wrapper"
 		sw_config="$sw_config --enable-nss-wrapper"
@@ -1052,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"
+	old_trees="$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel samba_3_waf samba_3_master"
 	for d in $old_trees; do
 		delete_old_tree $d
 	done
diff --git a/charis.fns b/charis.fns
index f3cad962..1a2cf92c 100755
--- a/charis.fns
+++ b/charis.fns
@@ -9,7 +9,5 @@ system=`uname`
 
 compiler=gcc
 test_tree samba_4_0_test . gcc
-export config="--enable-merged-build"
-test_tree samba_3_master source3 gcc
 
 global_unlock
diff --git a/coverage.fns b/coverage.fns
index 0846b230..506df931 100644
--- a/coverage.fns
+++ b/coverage.fns
@@ -17,6 +17,5 @@ test_tree samba_4_0_test . $compiler
 
 test_tree samba_3_current source3 $compiler
 test_tree samba_3_next source3 $compiler
-test_tree samba_3_master source3 $compiler
 
 global_unlock
diff --git a/fjall.fns b/fjall.fns
index 4398ba85..e7d82b72 100644
--- a/fjall.fns
+++ b/fjall.fns
@@ -24,7 +24,6 @@ export SAMBA_MAXTIME=36000
 test_tree samba_4_0_test . $compiler
 test_tree samba_3_current source3 $compiler
 test_tree samba_3_next source3 $compiler
-test_tree samba_3_master source3 $compiler
 
 export TESTS_ENVIRONMENT="$PWD/lorikeet-heimdal/libtool --mode=execute valgrind --trace-children=yes --quiet -q --num-callers=30 --gen-suppressions=all --suppressions=$PWD/lorikeet-heimdal/cf/valgrind-suppressions"
 test_tree lorikeet-heimdal . $compiler
diff --git a/generic.fns b/generic.fns
index 46f552a9..74e1a677 100644
--- a/generic.fns
+++ b/generic.fns
@@ -63,7 +63,6 @@ for compiler in $compilers; do
       export TDB_NO_FSYNC
       test_tree samba_3_current source3 $compiler
       test_tree samba_3_next source3 $compiler
-      test_tree samba_3_master source3 $compiler
       TDB_NO_FSYNC=0
       export TDB_NO_FSYNC
 
diff --git a/gwen.fns b/gwen.fns
index 2722993d..1d4df125 100644
--- a/gwen.fns
+++ b/gwen.fns
@@ -12,7 +12,6 @@ for compiler in $compilers; do
 
 	test_tree samba_3_current source3 $compiler
 	test_tree samba_3_next source3 $compiler
-	test_tree samba_3_master source3 $compiler
 done
 
 global_unlock
diff --git a/hape.fns b/hape.fns
index eda75d6c..5ddfa25f 100644
--- a/hape.fns
+++ b/hape.fns
@@ -25,8 +25,6 @@ for compiler in gcc ; do
 	test_tree samba_3_current source3 $compiler
 	export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
 	test_tree samba_3_next source3 $compiler
-	export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
-	test_tree samba_3_master source3 $compiler
 
 done
 
diff --git a/m104.fns b/m104.fns
index e9b03d66..be6bca90 100644
--- a/m104.fns
+++ b/m104.fns
@@ -128,4 +128,3 @@ per_run_hook
 
 test_tree samba_3_current source3 gcc
 test_tree samba_3_next source3 gcc
-test_tree samba_3_master source3 gcc
diff --git a/qnx18.fns b/qnx18.fns
index ecbf7e65..d41e2f50 100644
--- a/qnx18.fns
+++ b/qnx18.fns
@@ -15,7 +15,6 @@ fi
 
 #test_tree samba_3_current source3 $compiler
 test_tree samba_3_next source3 $compiler
-test_tree samba_3_master source3 $compiler
 
 # only attempt pidl if we have perl
 if which perl > /dev/null; then
diff --git a/snab.fns b/snab.fns
index 47ae2d6e..ca6c9f10 100644
--- a/snab.fns
+++ b/snab.fns
@@ -8,7 +8,7 @@ export CHECK_FLAGS="-Wall --beam::source=/home/tridge/beam/config.tcl --beam::pa
 # allow make cc_checker to take up to 8 hours
 export MAXTIME=28800
 
-for d in samba_3_current samba_3_next samba_3_master; do
+for d in samba_3_current samba_3_next; do
     export CFLAGS="$CHECK_FLAGS --beam::data=/home/tridge/beam/$d"
     mkdir -p /home/tridge/beam/$d
     test_tree $d source checker configure config_log config_header build cc_checker install test
diff --git a/sunX.fns b/sunX.fns
index e4609a1b..0df50986 100644
--- a/sunX.fns
+++ b/sunX.fns
@@ -22,7 +22,6 @@ for compiler in $compilers; do
 
 	test_tree samba_3_current source3 $compiler
 	test_tree samba_3_next source3 $compiler
-	test_tree samba_3_master source3 $compiler
 
 done
 
diff --git a/tridge.fns b/tridge.fns
index f5982009..5faee1ce 100644
--- a/tridge.fns
+++ b/tridge.fns
@@ -11,7 +11,6 @@ for compiler in $compilers; do
 
 	test_tree samba_3_current source3 $compiler
 	test_tree samba_3_next source3 $compiler
-	test_tree samba_3_master source3 $compiler
 done
 
 global_unlock
diff --git a/web/trees.conf b/web/trees.conf
index a0fa1386..5be6cb8c 100644
--- a/web/trees.conf
+++ b/web/trees.conf
@@ -30,12 +30,6 @@ repo = samba.git
 branch = v3-6-test
 srcdir = source3
 
-[samba_3_master]
-scm = git
-repo = samba.git
-branch = master
-srcdir = source3
-
 [samba_4_0_test]
 scm = git
 repo = samba.git