now that samba_3_waf is just a regular part of the build, remove seperate tree

diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 1a4d7b48548b2c53e83904de7a0bb8d4449d7daf..94758987a37be60e3bd4a6bee9aec60f76c2562e 100644 (file)
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -20,7 +20,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
-       test_tree samba_3_waf source3 $compiler
 done
 
 global_unlock

diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index efb706d6e5cc0f55f2067b922dc50398c87c75ab..86224120295370e2060e3eca5a9ba0ed8413ed4e 100644 (file)
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -26,7 +26,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
-       test_tree samba_3_waf source3 $compiler
        TDB_NO_FSYNC=0
        export TDB_NO_FSYNC
 

diff --git a/SerNet-aix.fns b/SerNet-aix.fns
index d7bb98ac6d086ceb03e5c1e33d200ea5f54a0b7b..825a42a75b76d4a4b1d371909e970420288740ca 100644 (file)
--- a/SerNet-aix.fns
+++ b/SerNet-aix.fns
@@ -27,7 +27,6 @@ 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 samba_3_waf source3 $compiler
 test_tree pidl . cc build test
 
 compiler="xlc_r"

diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index 67980441eadb89efae66424da844c8769ec53144..66464f4c25a1633b53b8f24e907f17e6bc8cf334 100644 (file)
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -38,7 +38,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
-       test_tree samba_3_waf source3 $compiler
        TDB_NO_FSYNC=0
        export TDB_NO_FSYNC
 done

diff --git a/build_test.fns b/build_test.fns
index 4616cd60fb7c5692ddfaf2ddabed700075d29d8f..b5ab052e180164e4d010fbccebd1bbc5af297fea 100644 (file)
--- a/build_test.fns
+++ b/build_test.fns
@@ -353,15 +353,6 @@ action_configure() {
                echo "CONFIGURE STATUS: $cstatus"
                return $cstatus
                ;;
-           samba_3_waf)
-               $builddir/timelimit $MAXTIME $srcdir/autogen-waf.sh
-               cstatus=$?
-               echo "autogen-waf.sh STATUS: $cstatus"
-               if [ x"$cstatus" != x"0" ]; then
-                   return $cstatus
-               fi
-               # fall through
-               ;;
        esac
 
        if [ ! -x $srcdir/configure -a -r $srcdir/Makefile.PL ]; then
@@ -965,7 +956,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"
+       old_trees="$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel samba_3_waf"
        for d in $old_trees; do
                delete_old_tree $d
        done

diff --git a/charis.fns b/charis.fns
index 0e8eb11b1343dc9d1167f2bb28d645874348460c..f3cad96285baa387137f1a81f83e444a1575adb2 100755 (executable)
--- a/charis.fns
+++ b/charis.fns
@@ -11,6 +11,5 @@ compiler=gcc
 test_tree samba_4_0_test . gcc
 export config="--enable-merged-build"
 test_tree samba_3_master source3 gcc
-test_tree samba_3_waf source3 gcc
 
 global_unlock

diff --git a/fjall.fns b/fjall.fns
index dc3adfe69d97133e2c0948a0faac806afda9cf65..4398ba85cd78d1308ee6f6c1472221cd41356814 100644 (file)
--- a/fjall.fns
+++ b/fjall.fns
@@ -25,7 +25,6 @@ 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
-test_tree samba_3_waf 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 453097ee50c3a40ea54b36a62a57666b502e04c8..25a6b2e09a738d2d40f38d3a644896d3ce56e4fb 100644 (file)
--- a/generic.fns
+++ b/generic.fns
@@ -64,7 +64,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
-      test_tree samba_3_waf source3 $compiler
       TDB_NO_FSYNC=0
       export TDB_NO_FSYNC
 

diff --git a/gwen.fns b/gwen.fns
index a9ee75ab7e3a02d63820e8b9226946c751480325..2722993d26ddd065002d4c65fa24096a2a1f0c9f 100644 (file)
--- a/gwen.fns
+++ b/gwen.fns
@@ -13,7 +13,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
-       test_tree samba_3_waf source3 $compiler
 done
 
 global_unlock

diff --git a/hape.fns b/hape.fns
index 18ba319d5f6acbec870b8f3967d066c6c280baa8..cd2996214381b2d1f7ddd1e34933a354a2dc5fe8 100644 (file)
--- a/hape.fns
+++ b/hape.fns
@@ -27,7 +27,6 @@ for compiler in gcc ; do
        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
-       test_tree samba_3_waf source3 $compiler
 
 done
 

diff --git a/m104.fns b/m104.fns
index 5594cb60c7c9f410f82c3f9dc6fe9304bc177f91..e9b03d66b596b3337af47f3d31b8f9b5c4b64116 100644 (file)
--- a/m104.fns
+++ b/m104.fns
@@ -129,4 +129,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
-test_tree samba_3_waf source3 gcc

diff --git a/magni.fns b/magni.fns
index aa8fd4af064cc2f5f9cee176136a35658a60d6a6..2177cfecb4705d11e02fc09a4c8844c04082355c 100644 (file)
--- a/magni.fns
+++ b/magni.fns
@@ -16,7 +16,6 @@ export config=""
 test_tree samba_3_current source3 $compiler
 test_tree samba_3_next source3 $compiler
 test_tree samba_3_master source3 $compiler
-test_tree samba_3_waf source3 $compiler
 
 #lcov and libtool disagree, enable OpenLDAP and disable OpenSSL
 export config="--with-ldap=/usr --without-openssl --disable-shared"

diff --git a/opi.fns b/opi.fns
index 0420ef28c2878f584295aa31ecafe04c4ca83e55..2c10d0d6cc955b2c53246c58b83868169a2afd3c 100644 (file)
--- a/opi.fns
+++ b/opi.fns
@@ -17,7 +17,6 @@ test_tree samba_3_current source3 $compiler
 test_tree samba_3_next source3 $compiler
 export config="--enable-developer"
 test_tree samba_3_master source3 $compiler
-test_tree samba_3_waf source3 $compiler
 export config=""
 test_tree pidl . $compiler build test
 

diff --git a/qnx18.fns b/qnx18.fns
index 063f9b95f366a545af6438048bffacbb1902b99f..ecbf7e659f0d5cf1eb2fc6a23fe3af6a40d075e1 100644 (file)
--- a/qnx18.fns
+++ b/qnx18.fns
@@ -16,7 +16,6 @@ fi
 #test_tree samba_3_current source3 $compiler
 test_tree samba_3_next source3 $compiler
 test_tree samba_3_master source3 $compiler
-test_tree samba_3_waf source3 $compiler
 
 # only attempt pidl if we have perl
 if which perl > /dev/null; then

diff --git a/sunX.fns b/sunX.fns
index 1b668744a494fb18323c15f3a3def45554a6fb3e..e4609a1bd0f6e16f1e6b821b86eb3b591428ff2d 100644 (file)
--- a/sunX.fns
+++ b/sunX.fns
@@ -23,7 +23,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
-       test_tree samba_3_waf source3 $compiler
 
 done
 

diff --git a/web/trees.conf b/web/trees.conf
index 3b497d1860801981dc2906b86a2d443dac87fa40..bfa4c0373576557fcb4a320538e3755bc21331a2 100644 (file)
--- a/web/trees.conf
+++ b/web/trees.conf
@@ -36,12 +36,6 @@ repo = samba.git
 branch = master
 srcdir = source3
 
-[samba_3_waf]
-scm = git
-repo = samba.git
-branch = master
-srcdir = source3
-
 [samba_4_0_test]
 scm = git
 repo = samba.git