[SCM] build.samba.org - branch master updated
Andrew Tridgell
tridge at samba.org
Tue Feb 8 16:20:46 MST 2011
The branch, master has been updated
via ecacea8 enable samba_3_waf build
via 64bff4a don't send emails about samba_3_waf builds yet
via 6c458e6 support samba_3_waf builds
from 00aea84 switch the build farm to using the top level Samba4 build
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit ecacea86a2010b814daff025f5575b8d5bf9141c
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Feb 9 10:19:00 2011 +1100
enable samba_3_waf build
also switch to source3 for s3 builds, which better matches what end
users do
commit 64bff4a492fb94f8e45b0998ab24a79aec86ed84
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Feb 9 10:18:30 2011 +1100
don't send emails about samba_3_waf builds yet
commit 6c458e631fb03370d57724bb917e58053e04b306
Author: Andrew Tridgell <tridge at samba.org>
Date: Wed Feb 9 10:18:18 2011 +1100
support samba_3_waf builds
-----------------------------------------------------------------------
Summary of changes:
SerNet-IRIX.fns | 8 ++++----
SerNet-Tru64.fns | 7 ++++---
SerNet-aix.fns | 7 ++++---
SerNet-solaris8.fns | 7 ++++---
build_test.fns | 11 ++++++++++-
charis.fns | 3 ++-
fjall.fns | 7 ++++---
generic.fns | 7 ++++---
gwen.fns | 7 ++++---
hape.fns | 7 ++++---
import-and-analyse.py | 4 ++++
m104.fns | 7 ++++---
magni.fns | 7 ++++---
opi.fns | 7 ++++---
qnx18.fns | 7 ++++---
sunX.fns | 7 ++++---
16 files changed, 68 insertions(+), 42 deletions(-)
Changeset truncated at 500 lines:
diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 8713691..1a4d7b4 100644
--- 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 188991b..efb706d 100644
--- 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 56632ef..d7bb98a 100644
--- 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 b76abda..6798044 100644
--- 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/build_test.fns b/build_test.fns
index 552862a..7b2bff8 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -345,7 +345,7 @@ action_lcovreport() {
############################
action_configure() {
-
+ # special handling for some trees
case "$tree" in
waf*)
$builddir/timelimit $MAXTIME ./waf configure
@@ -353,6 +353,15 @@ 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
diff --git a/charis.fns b/charis.fns
index cc41382..0e8eb11 100755
--- 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 8fb7017..dc3adfe 100644
--- 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 508afad..453097e 100644
--- 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 3ee75c2..a9ee75a 100644
--- 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 5ff0ab7..18ba319 100644
--- 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/import-and-analyse.py b/import-and-analyse.py
index 5775b1f..c7ef5cb 100755
--- a/import-and-analyse.py
+++ b/import-and-analyse.py
@@ -43,6 +43,10 @@ def check_and_send_mails(cur, old):
# from git svn
return
+ if cur.tree is "samba_3_waf":
+ # no emails for this until it stabilises a bit
+ return
+
t = buildfarm.trees[cur.tree]
diff = BuildDiff(t, old, cur)
diff --git a/m104.fns b/m104.fns
index 6e42163..5594cb6 100644
--- 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 0ee579a..aa8fd4a 100644
--- 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 049eb64..0420ef2 100644
--- 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 64548e7..063f9b9 100644
--- 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 76e72fe..1b66874 100644
--- 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
--
build.samba.org
More information about the samba-cvs
mailing list