remove all references to samba_3_master and mark as a removed tree

diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 94758987a37be60e3bd4a6bee9aec60f76c2562e..cdcb6cb3b08ef9daaefb9e06440d38762ee291a5 100644 (file)
--- 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 82009766ef01c1646ff161812adb3181cf857948..6ed481abf7c38a605b22bc153b4d6d3b69ce22a2 100644 (file)
--- 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 66464f4c25a1633b53b8f24e907f17e6bc8cf334..0788ce8e641e4254e3d8f9291e86ea54baf28427 100644 (file)
--- 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 ded4d098a223d6d0ec4daf252401a44e0b71f490..de2023e31376474514f0ace61135f7782a6f2afa 100644 (file)
--- 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 f3cad96285baa387137f1a81f83e444a1575adb2..1a2cf92c4fa9a3a9df2d7979acc5320effbb61dd 100755 (executable)
--- 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 0846b2305da367134e2af2d5bf22059f3275877e..506df931f363faf25d943bde19abbc9498eda80b 100644 (file)
--- 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 4398ba85cd78d1308ee6f6c1472221cd41356814..e7d82b7297fc4604a54db90c8684627f03198593 100644 (file)
--- 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 46f552a9cf541e512ce1e2ef1b87a977a69b3cce..74e1a677ac1fbcc229a380f0c4030b3f4b79134e 100644 (file)
--- 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 2722993d26ddd065002d4c65fa24096a2a1f0c9f..1d4df1257d6321ea0296ed7071a74eb7acd39c49 100644 (file)
--- 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 eda75d6c8a0158fe1a4a0f2004fec8a58d8068f4..5ddfa25f4f4c044d03c1b88fc397229e79c69c55 100644 (file)
--- 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 e9b03d66b596b3337af47f3d31b8f9b5c4b64116..be6bca90e787239e2367620a3f1a5d6a27f8f343 100644 (file)
--- 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 ecbf7e659f0d5cf1eb2fc6a23fe3af6a40d075e1..d41e2f502908a5d81f6c17b1ed3227f5b3c3e52d 100644 (file)
--- 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 47ae2d6ed66302690a6a483347a84945cd2abc63..ca6c9f10fcbb696241f2d75f67699454eeddfaed 100644 (file)
--- 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 e4609a1bd0f6e16f1e6b821b86eb3b591428ff2d..0df50986053b25ebf253d67b6771cf65f4d5578c 100644 (file)
--- 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 f5982009840275adcef7a37757f7ec2a4d4d962d..5faee1cee329f8de2a97c8f66705369e6bdee0a4 100644 (file)
--- 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 a0fa1386103bab8bde413d5585441d10aeb9fed0..5be6cb8cb2b5730deadb9cc29289f663272b5565 100644 (file)
--- 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