now that samba_3_waf is just a regular part of the build, remove seperate tree
authorAndrew Bartlett <abartlet@samba.org>
Fri, 7 Oct 2011 09:23:17 +0000 (20:23 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 7 Oct 2011 09:26:31 +0000 (20:26 +1100)
16 files changed:
SerNet-IRIX.fns
SerNet-Tru64.fns
SerNet-aix.fns
SerNet-solaris8.fns
build_test.fns
charis.fns
fjall.fns
generic.fns
gwen.fns
hape.fns
m104.fns
magni.fns
opi.fns
qnx18.fns
sunX.fns
web/trees.conf

index 1a4d7b4..9475898 100644 (file)
@@ -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
index efb706d..8622412 100644 (file)
@@ -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
 
index d7bb98a..825a42a 100644 (file)
@@ -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"
index 6798044..66464f4 100644 (file)
@@ -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
index 4616cd6..b5ab052 100644 (file)
@@ -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
index 0e8eb11..f3cad96 100755 (executable)
@@ -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
index dc3adfe..4398ba8 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
index 453097e..25a6b2e 100644 (file)
@@ -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
 
index a9ee75a..2722993 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
index 18ba319..cd29962 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
 
index 5594cb6..e9b03d6 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
index aa8fd4a..2177cfe 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 0420ef2..2c10d0d 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
 
index 063f9b9..ecbf7e6 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
index 1b66874..e4609a1 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
 
index 3b497d1..bfa4c03 100644 (file)
@@ -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