Update the trees currently used by the build farm to build samba.

diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index cdcb6cb3b08ef9daaefb9e06440d38762ee291a5..afb1b3fd7e2d09094f0a617970bb0ec61a6df5b8 100644 (file)
--- 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 91c958f98787edec6583ff6ab1581ed4f559d532..a3e24e6e2912a08fc823523206f56a0ccfb2dcee 100644 (file)
--- 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 3571b6045c1f546e90142eb61a39d6e135c5217c..ded96c96b1b9f49b0cc2c8407efee084fc083200 100644 (file)
--- 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 91c958f98787edec6583ff6ab1581ed4f559d532..6d60518ac111abd3e1294626458f5e7bf16dc79a 100644 (file)
--- 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 0788ce8e641e4254e3d8f9291e86ea54baf28427..a46a943ea38faf9abaeed933ec95cf3ec5049eca 100644 (file)
--- 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 aec66d422e4012c061352a5762402fae97fefad1..29d77b8568ecb0c2b01e77214c1328ff62bf15ed 100644 (file)
--- 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 506df931f363faf25d943bde19abbc9498eda80b..62c8f8661db3cef503a291fe8bd04960ea75dc08 100644 (file)
--- 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 5ddfa25f4f4c044d03c1b88fc397229e79c69c55..99560715b30cebc38dedf9736ad18e990afcd435 100644 (file)
--- 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 2ba486469c31b20df4cc57b34ccd207ffb407bd3..db17a035b7871e48ee9c78ba1e3a520a765187b3 100644 (file)
--- 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 91c958f98787edec6583ff6ab1581ed4f559d532..a3e24e6e2912a08fc823523206f56a0ccfb2dcee 100644 (file)
--- 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 5faee1cee329f8de2a97c8f66705369e6bdee0a4..8f869feb0b2b2ed190dc410b5dda5ebbc49a4ada 100644 (file)
--- 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