From ff8e6d7ccaac87d9aeadbc4160eead2df45366b0 Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@comstyle.com>
Date: Sat, 2 May 2015 06:59:58 -0400
Subject: [PATCH] Update the trees currently used by the build farm to build
 samba.

---
 SerNet-IRIX.fns     |  7 +++----
 SerNet-NetBSD5.fns  |  7 +++----
 SerNet-Tru64.fns    |  7 +++----
 SerNet-imini.fns    |  6 +++---
 SerNet-solaris8.fns |  6 +++---
 build_test.fns      | 10 +++-------
 coverage.fns        |  7 +++----
 hape.fns            | 11 ++++-------
 hpisgr8.fns         |  7 +++----
 kilkenny.fns        |  7 +++----
 tridge.fns          |  7 +++----
 11 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index cdcb6cb3..afb1b3fd 100644
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -15,10 +15,9 @@ for compiler in $compilers; do
 	#export config="--with-included-popt"
 	. common.fns
 
-	test_tree samba_4_0_test . $compiler
-
-	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
 done
 
 global_unlock
diff --git a/SerNet-NetBSD5.fns b/SerNet-NetBSD5.fns
index 91c958f9..a3e24e6e 100644
--- a/SerNet-NetBSD5.fns
+++ b/SerNet-NetBSD5.fns
@@ -9,11 +9,10 @@ for compiler in $compilers; do
 	. common.fns
 
 	export config="--without-acl-support"
-	test_tree samba_4_0_test . $compiler
+	test_tree samba_current . $compiler
+	test_tree samba_next . $compiler
+	test_tree samba_master . $compiler
 	export config=""
-
-	test_tree samba_3_current source3 $compiler
-	test_tree samba_3_next source3 $compiler
 done
 
 global_unlock
diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index 3571b604..ded96c96 100644
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -18,12 +18,11 @@ for compiler in $compilers; do
 
 	config="--without-acl-support"
 	export config
-	test_tree samba_4_0_test . $compiler
+	test_tree samba_current . $compiler
+	test_tree samba_next . $compiler
+	test_tree samba_master . $compiler
 	config=""
 	export config
-
-	test_tree samba_3_current source3 $compiler
-	test_tree samba_3_next source3 $compiler
 done
 
 global_unlock
diff --git a/SerNet-imini.fns b/SerNet-imini.fns
index 91c958f9..6d60518a 100644
--- a/SerNet-imini.fns
+++ b/SerNet-imini.fns
@@ -9,11 +9,11 @@ for compiler in $compilers; do
 	. common.fns
 
 	export config="--without-acl-support"
-	test_tree samba_4_0_test . $compiler
+	test_tree samba_current . $compiler
+	test_tree samba_next . $compiler
+	test_tree samba_master . $compiler
 	export config=""
 
-	test_tree samba_3_current source3 $compiler
-	test_tree samba_3_next source3 $compiler
 done
 
 global_unlock
diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index 0788ce8e..a46a943e 100644
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -34,9 +34,9 @@ for compiler in $compilers; do
 	. common.fns
 	TDB_NO_FSYNC=1
 	export TDB_NO_FSYNC
-	test_tree samba_4_0_test . $compiler
-	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
 done
diff --git a/build_test.fns b/build_test.fns
index aec66d42..29d77b85 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -640,7 +640,7 @@ test_tree() {
 	deptrees=""
 	case "$tree" in
 		samba-gtk)
-		deptrees="samba_4_0_test"
+		deptrees="samba_current"
 		;;
 	esac
 
@@ -750,15 +750,11 @@ test_tree() {
 	lorikeet-heimdal)
 		sw_config="$config --enable-socket-wrapper"
 		;;
-	samba_4*)
+	samba_*)
 		sw_config="$config --enable-selftest"
 		;;
-	samba_3*)
-		sw_config="$config --enable-socket-wrapper"
-		sw_config="$sw_config --enable-nss-wrapper"
-		;;
 	samba-gtk)
-		PKG_CONFIG_PATH="$test_root/prefix/samba_4_0_test.$compiler/lib/pkgconfig"
+		PKG_CONFIG_PATH="$test_root/prefix/samba_current.$compiler/lib/pkgconfig"
 		export PKG_CONFIG_PATH
 		;;
 	*)
diff --git a/coverage.fns b/coverage.fns
index 506df931..62c8f866 100644
--- a/coverage.fns
+++ b/coverage.fns
@@ -13,9 +13,8 @@ compiler="callcatcher-gcc"
 . common.fns
 
 export PIDL_TESTS_SKIP=yes
-test_tree samba_4_0_test . $compiler
-
-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
 
 global_unlock
diff --git a/hape.fns b/hape.fns
index 5ddfa25f..99560715 100644
--- a/hape.fns
+++ b/hape.fns
@@ -19,13 +19,10 @@ for compiler in gcc ; do
 	. common.fns
 
 	export config="--bundled-libraries=popt"
-	MAKE=gmake test_tree samba_4_0_test . $compiler
-
-	export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
-	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
-
+	MAKE=gmake
+	test_tree samba_current . $compiler
+	test_tree samba_next . $compiler
+	test_tree samba_master . $compiler
 done
 
 global_unlock
diff --git a/hpisgr8.fns b/hpisgr8.fns
index 2ba48646..db17a035 100644
--- a/hpisgr8.fns
+++ b/hpisgr8.fns
@@ -17,12 +17,11 @@ for compiler in $compilers; do
 
 	config="--without-acl-support"
 	export config
-	test_tree samba_4_0_test . $compiler
+	test_tree samba_current . $compiler
+	test_tree samba_next . $compiler
+	test_tree samba_master . $compiler
 	config=""
 	export config
-
-	test_tree samba_3_current source3 $compiler
-	test_tree samba_3_next source3 $compiler
 done
 
 global_unlock
diff --git a/kilkenny.fns b/kilkenny.fns
index 91c958f9..a3e24e6e 100644
--- a/kilkenny.fns
+++ b/kilkenny.fns
@@ -9,11 +9,10 @@ for compiler in $compilers; do
 	. common.fns
 
 	export config="--without-acl-support"
-	test_tree samba_4_0_test . $compiler
+	test_tree samba_current . $compiler
+	test_tree samba_next . $compiler
+	test_tree samba_master . $compiler
 	export config=""
-
-	test_tree samba_3_current source3 $compiler
-	test_tree samba_3_next source3 $compiler
 done
 
 global_unlock
diff --git a/tridge.fns b/tridge.fns
index 5faee1ce..8f869feb 100644
--- a/tridge.fns
+++ b/tridge.fns
@@ -7,10 +7,9 @@ compilers="gcc"
 for compiler in $compilers; do
 	. common.fns
 
-	test_tree samba_4_0_test . $compiler
-
-	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
 done
 
 global_unlock
-- 
2.34.1