enable samba_3_waf build

also switch to source3 for s3 builds, which better matches what end
users do

diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 87136916aca2b63c62512faa2916b0d5302e4d92..1a4d7b48548b2c53e83904de7a0bb8d4449d7daf 100644 (file)
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -17,10 +17,10 @@ for compiler in $compilers; do
 
        test_tree samba_4_0_test . $compiler
 
-       test_tree samba_3_current source $compiler
-       test_tree samba_3_next source $compiler
-       test_tree samba_3_master source $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
 done
 
 global_unlock

diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index 188991bcff7a8e4e45296ec2718f0dbc976f8687..efb706d6e5cc0f55f2067b922dc50398c87c75ab 100644 (file)
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -23,9 +23,10 @@ for compiler in $compilers; do
        CPPFLAGS="$SAVED_CPPFLAGS"
        export CPPFLAGS
 
-       test_tree samba_3_current source $compiler
-       test_tree samba_3_next source $compiler
-       test_tree samba_3_master source $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
        TDB_NO_FSYNC=0
        export TDB_NO_FSYNC
 

diff --git a/SerNet-aix.fns b/SerNet-aix.fns
index 56632efd2a8cfa78f31779e604ce0193b4aeac2e..d7bb98ac6d086ceb03e5c1e33d200ea5f54a0b7b 100644 (file)
--- a/SerNet-aix.fns
+++ b/SerNet-aix.fns
@@ -24,9 +24,10 @@ compiler="cc"
 . common.fns
 
 test_tree lorikeet-heimdal . $compiler
-test_tree samba_3_current source $compiler
-test_tree samba_3_next source $compiler
-test_tree samba_3_master source $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 b76abdadbc4c70fbe23fe26605d6f692fbb08abe..67980441eadb89efae66424da844c8769ec53144 100644 (file)
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -35,9 +35,10 @@ for compiler in $compilers; do
        TDB_NO_FSYNC=1
        export TDB_NO_FSYNC
        test_tree samba_4_0_test . $compiler
-       test_tree samba_3_current source $compiler
-       test_tree samba_3_next source $compiler
-       test_tree samba_3_master source $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
        TDB_NO_FSYNC=0
        export TDB_NO_FSYNC
 done

diff --git a/charis.fns b/charis.fns
index cc413823ded582acde2054f614ce8f7d3491364e..0e8eb11b1343dc9d1167f2bb28d645874348460c 100755 (executable)
--- a/charis.fns
+++ b/charis.fns
@@ -10,6 +10,7 @@ system=`uname`
 compiler=gcc
 test_tree samba_4_0_test . gcc
 export config="--enable-merged-build"
-test_tree samba_3_master source gcc
+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 8fb7017ef2e19c997944c80ab474f5f4464cf121..dc3adfe69d97133e2c0948a0faac806afda9cf65 100644 (file)
--- a/fjall.fns
+++ b/fjall.fns
@@ -22,9 +22,10 @@ export SMBD_MAXTIME=36000
 export SAMBA_MAXTIME=36000
 
 test_tree samba_4_0_test . $compiler
-test_tree samba_3_current source $compiler
-test_tree samba_3_next source $compiler
-test_tree samba_3_master source $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 508afade7e9894da1da2dc693d251d8301256cda..453097ee50c3a40ea54b36a62a57666b502e04c8 100644 (file)
--- a/generic.fns
+++ b/generic.fns
@@ -61,9 +61,10 @@ for compiler in $compilers; do
 
       TDB_NO_FSYNC=1
       export TDB_NO_FSYNC
-      test_tree samba_3_current source $compiler
-      test_tree samba_3_next source $compiler
-      test_tree samba_3_master source $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
       TDB_NO_FSYNC=0
       export TDB_NO_FSYNC
 

diff --git a/gwen.fns b/gwen.fns
index 3ee75c217bcb943065c960c5ecf5da6d8b0c8790..a9ee75ab7e3a02d63820e8b9226946c751480325 100644 (file)
--- a/gwen.fns
+++ b/gwen.fns
@@ -10,9 +10,10 @@ for compiler in $compilers; do
 
        test_tree samba_4_0_test . $compiler
 
-       test_tree samba_3_current source $compiler
-       test_tree samba_3_next source $compiler
-       test_tree samba_3_master source $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
 done
 
 global_unlock

diff --git a/hape.fns b/hape.fns
index 5ff0ab7281c1a2313874d5de4806417250da4f92..18ba319d5f6acbec870b8f3967d066c6c280baa8 100644 (file)
--- a/hape.fns
+++ b/hape.fns
@@ -22,11 +22,12 @@ for compiler in gcc ; do
        MAKE=gmake test_tree samba_4_0_test . $compiler
 
        export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
-       test_tree samba_3_current source $compiler
+       test_tree samba_3_current source3 $compiler
        export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
-       test_tree samba_3_next source $compiler
+       test_tree samba_3_next source3 $compiler
        export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
-       test_tree samba_3_master source $compiler
+       test_tree samba_3_master source3 $compiler
+       test_tree samba_3_waf source3 $compiler
 
 done
 

diff --git a/m104.fns b/m104.fns
index 6e4216315f49d0668c9ca326e975143e0c7fd710..5594cb60c7c9f410f82c3f9dc6fe9304bc177f91 100644 (file)
--- a/m104.fns
+++ b/m104.fns
@@ -126,6 +126,7 @@ per_run_hook
 
 . common.fns
 
-test_tree samba_3_current source gcc
-test_tree samba_3_next source gcc
-test_tree samba_3_master source gcc
+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 0ee579a21f05426a61d66a80482f3fb3bf95cd63..aa8fd4af064cc2f5f9cee176136a35658a60d6a6 100644 (file)
--- a/magni.fns
+++ b/magni.fns
@@ -13,9 +13,10 @@ export PIDL_TESTS_SKIP=yes
 test_tree samba_4_0_test . $compiler configure config_log config_header build install test lcovreport
 
 export config=""
-test_tree samba_3_current source $compiler
-test_tree samba_3_next source $compiler
-test_tree samba_3_master source $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
 
 #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 049eb6474a0b4915482897e4dc7301bab96c81a8..0420ef28c2878f584295aa31ecafe04c4ca83e55 100644 (file)
--- a/opi.fns
+++ b/opi.fns
@@ -13,10 +13,11 @@ export config="--with-selftest-prefix=/data/bf/st.samba_4_0_test"
 test_tree samba_4_0_test . $compiler
 export config=""
 
-test_tree samba_3_current source $compiler
-test_tree samba_3_next source $compiler
+test_tree samba_3_current source3 $compiler
+test_tree samba_3_next source3 $compiler
 export config="--enable-developer"
-test_tree samba_3_master source $compiler
+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 64548e759c8357828bd384ad5f81a47c3440db19..063f9b95f366a545af6438048bffacbb1902b99f 100644 (file)
--- a/qnx18.fns
+++ b/qnx18.fns
@@ -13,9 +13,10 @@ if which perl > /dev/null; then
        test_tree samba_4_0_test . $compiler
 fi
 
-#test_tree samba_3_current source $compiler
-test_tree samba_3_next source $compiler
-test_tree samba_3_master source $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
 
 # only attempt pidl if we have perl
 if which perl > /dev/null; then

diff --git a/sunX.fns b/sunX.fns
index 76e72feec67aab15c29e281bd1449208c0fc8212..1b668744a494fb18323c15f3a3def45554a6fb3e 100644 (file)
--- a/sunX.fns
+++ b/sunX.fns
@@ -20,9 +20,10 @@ for compiler in $compilers; do
        TDB_NO_FSYNC=0
        export TDB_NO_FSYNC
 
-       test_tree samba_3_current source $compiler
-       test_tree samba_3_next source $compiler
-       test_tree samba_3_master source $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
 
 done