From: Andrew Bartlett Date: Fri, 7 Oct 2011 09:23:17 +0000 (+1100) Subject: now that samba_3_waf is just a regular part of the build, remove seperate tree X-Git-Url: http://git.samba.org/?p=build-farm.git;a=commitdiff_plain;h=01a3d51024f13d6b4b92899910950e7301bfec18 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 1a4d7b48..94758987 100644 --- 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 efb706d6..86224120 100644 --- 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 d7bb98ac..825a42a7 100644 --- 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 67980441..66464f4c 100644 --- 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 4616cd60..b5ab052e 100644 --- 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 0e8eb11b..f3cad962 100755 --- 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 dc3adfe6..4398ba85 100644 --- 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 453097ee..25a6b2e0 100644 --- 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 a9ee75ab..2722993d 100644 --- 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 18ba319d..cd299621 100644 --- 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 5594cb60..e9b03d66 100644 --- 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 aa8fd4af..2177cfec 100644 --- 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 0420ef28..2c10d0d6 100644 --- 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 063f9b95..ecbf7e65 100644 --- 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 1b668744..e4609a1b 100644 --- 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 3b497d18..bfa4c037 100644 --- 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