don't build samba4 with the old build system any more

git-svn-id: file:///home/svn/build-farm/trunk@973 1e5ffdc8-eadd-0310-9daa-9cb4117fe24b

diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index a5878f27bdcb5481f15bda968aa33bb4c21707c3..bc3d7b50d6257defc4f632939d41888e07ca6dc7 100644 (file)
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -13,7 +13,6 @@ for compiler in cc ; do
        #export config="--with-included-popt"
        . common.fns
 
-       test_tree samba_4_0_test source $compiler
        test_tree samba_4_0_waf source4 $compiler
 
        test_tree samba_3_current source $compiler

diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index bd7b85309e2f30305bfee760c51cebedbb40d1cb..2106f07f52ea32cdf8b7b9da9b4a0ca5fcacbb4e 100644 (file)
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -13,7 +13,6 @@ export SAMBA_MAXTIME
 
 . common.fns
 test_tree lorikeet-heimdal . $compiler
-CFLAGS="-g1 ${CFLAGS}" test_tree samba_4_0_test source $compiler
 CFLAGS="-g1 ${CFLAGS}" test_tree samba_4_0_waf source4 $compiler
 CFLAGS="-g1 ${CFLAGS}" test_tree samba_3_current source $compiler
 CFLAGS="-g1 ${CFLAGS}" test_tree samba_3_next source $compiler

diff --git a/SerNet-aix.fns b/SerNet-aix.fns
index a3a06487a7f7675de549bf067882ae53f4007121..996d520a63bddd0b31555f5c78821aff60d3b59d 100644 (file)
--- a/SerNet-aix.fns
+++ b/SerNet-aix.fns
@@ -11,7 +11,6 @@ compiler="cc"
 . common.fns
 
 test_tree lorikeet-heimdal . $compiler
-MAKE=gmake test_tree samba_4_0_test source $compiler
 test_tree samba_3_current source $compiler
 test_tree samba_3_next source $compiler
 test_tree samba_3_master source $compiler

diff --git a/SerNet-imini.fns b/SerNet-imini.fns
index aac7e626dbeb57574f4f06da7fa01dad35552b05..2ba3eccecbbcca52ed712607b572ce5ff62982aa 100644 (file)
--- a/SerNet-imini.fns
+++ b/SerNet-imini.fns
@@ -5,7 +5,6 @@ global_lock
 for compiler in gcc cc; do
        . common.fns
 
-       test_tree samba_4_0_test source $compiler
        test_tree samba_4_0_waf source4 $compiler
 
        test_tree samba_3_current source $compiler

diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index a02a94046aae4824d906c867724dc89b9e57d031..ada9acb79c759ae7639213558f2757aa868d64dc 100644 (file)
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -12,8 +12,6 @@ for compiler in cc gcc; do
        #export config="--with-included-popt"
        . common.fns
 
-       test_tree samba_4_0_test source $compiler
-
        test_tree samba_4_0_waf source4 $compiler
 
        test_tree samba_3_current source $compiler

diff --git a/charis.fns b/charis.fns
index 49aa64b1d0b517e48bc7f2db08e67333b5e0ce29..214fde223b531302f0f6061c1bec064ecb13e9ee 100755 (executable)
--- a/charis.fns
+++ b/charis.fns
@@ -9,8 +9,6 @@ system=`uname`
 
 compiler=gcc
 test_tree samba_4_0_waf source4 gcc
-export config="--enable-automatic-dependencies"
-test_tree samba_4_0_test source gcc
 export config="--enable-merged-build"
 test_tree samba_3_master source gcc
 

diff --git a/fjall.fns b/fjall.fns
index 1d31956ef0c143915ec1c6567d97a3d1cdcc6703..05484b2e4f87ca7e7d43cfabc5311c2db5a8e442 100644 (file)
--- a/fjall.fns
+++ b/fjall.fns
@@ -20,7 +20,6 @@ export SMBD_MAXTIME=24000
 export SAMBA_MAXTIME=24000
 
 test_tree samba_4_0_waf source4 gcc
-test_tree samba_4_0_test source gcc
 test_tree samba_3_current source gcc
 test_tree samba_3_next source gcc
 test_tree samba_3_master source gcc

diff --git a/generic.fns b/generic.fns
index a8155394e16650af38fa91d50484b1bfce4fab58..5d8e79b23443c120ac8d67c5ea2934169b0aedfc 100644 (file)
--- a/generic.fns
+++ b/generic.fns
@@ -41,16 +41,6 @@ for compiler in gcc cc icc; do
       . common.fns
       test_tree lorikeet-heimdal . $compiler
 
-      # only attempt samba_4_0_test if we have perl
-      if which perl > /dev/null; then
-        # use gmake if available
-        if [ "x$MAKE" = "x" ] && which gmake > /dev/null; then
-               MAKE=gmake test_tree samba_4_0_test source $compiler
-       else
-               test_tree samba_4_0_test source $compiler
-       fi        
-      fi
-
       # only attempt samba-gtk if we have perl and gtk+-2.0
       if which perl > /dev/null && which pkg-config > /dev/null && pkg-config --exists gtk+-2.0; then
         test_tree samba-gtk . $compiler

diff --git a/gwen.fns b/gwen.fns
index eb4a5cd7636c99a35af94fc9655515487a90e856..77a3258a866f2b0c98a8e51792a9d3df6117b722 100644 (file)
--- a/gwen.fns
+++ b/gwen.fns
@@ -7,7 +7,6 @@ global_lock
 for compiler in gcc cc; do
        . common.fns
 
-       test_tree samba_4_0_test source $compiler
        test_tree samba_4_0_waf source4 $compiler
 
        test_tree samba_3_current source $compiler

diff --git a/hape.fns b/hape.fns
index 200bda4e8be794e95e640692eb72060ff2367b08..a9839a3d4685c996dbed4f87310a44229766352a 100644 (file)
--- a/hape.fns
+++ b/hape.fns
@@ -18,11 +18,6 @@ for compiler in gcc ; do
        export config=""
        . common.fns
 
-       # sun_path for unix sockets is char[92]
-       # so we need to use shorter pathes for make test
-       export config="--with-selftest-prefix=/data/home/build/st.samba_4_0_test --with-included-popt"
-       MAKE=gmake test_tree samba_4_0_test source $compiler
-
        export config="--bundled-libraries=popt"
        MAKE=gmake test_tree samba_4_0_waf source4 $compiler
 

diff --git a/m104.fns b/m104.fns
index 678246bef19d92ced19032f9c0e24f2e6fba4068..6e4216315f49d0668c9ca326e975143e0c7fd710 100644 (file)
--- a/m104.fns
+++ b/m104.fns
@@ -129,5 +129,3 @@ per_run_hook
 test_tree samba_3_current source gcc
 test_tree samba_3_next source gcc
 test_tree samba_3_master source gcc
-#Skip Samba4 until we shorten file names
-#test_tree samba_4_0_test source gcc

diff --git a/magni.fns b/magni.fns
index 6be81e70d72b461f8417112501b8f197a8e573fc..cc33699d9f11a6bf6bfc9c0c33ea4231dbe9ef6e 100644 (file)
--- a/magni.fns
+++ b/magni.fns
@@ -10,7 +10,6 @@ compiler=gcc
 #lcov like shared libraries
 export config="--disable-shared"
 export PIDL_TESTS_SKIP=yes
-test_tree samba_4_0_test source $compiler 
 test_tree samba_4_0_waf source4 $compiler 
 
 export config=""

diff --git a/opi.fns b/opi.fns
index 4b268e493435285594896365936c079aefc971c9..160913a69d0f069908b0acd2c491c1bb88dce5d3 100644 (file)
--- a/opi.fns
+++ b/opi.fns
@@ -9,8 +9,6 @@ export CFLAGS
 . common.fns
 #test_tree lorikeet-heimdal . $compiler
 
-export config="--with-selftest-prefix=/data/bf/st.samba_4_0_test"
-test_tree samba_4_0_test source $compiler
 export config="--with-selftest-prefix=/data/bf/st.samba_4_0_waf"
 test_tree samba_4_0_waf source4 $compiler
 export config=""

diff --git a/qnx18.fns b/qnx18.fns
index 1dcd1263d2e4eebc87dc80056afdab75440a0aa4..ec63089ca8660d584b10290c75006842238da23e 100644 (file)
--- a/qnx18.fns
+++ b/qnx18.fns
@@ -10,7 +10,6 @@ compiler=gcc
 test_tree lorikeet-heimdal . $compiler
 
 if which perl > /dev/null; then
-       test_tree samba_4_0_test source $compiler
        test_tree samba_4_0_waf source4 $compiler
 fi
 

diff --git a/snab.fns b/snab.fns
index f60cf1b176555331c2179739d6fed83a3fc15eea..204bed652ec74c7b866370465a90e936abca4cc3 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_4_0_test samba_3_current samba_3_next samba_3_master; do
+for d in samba_3_current samba_3_next samba_3_master; 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