[SCM] build.samba.org - branch master updated
Andrew Bartlett
abartlet at samba.org
Mon Jan 6 18:51:07 MST 2014
The branch, master has been updated
via 43b5c25 Add --without-gettext to restore Samba build on hpisgr8
via c90aa48 Add --without-gettext to restore Samba build on SerNET-Tru64
via e037a38 Add --without-gettext to restore Samba build on SerNet-IRIX
via 404b035 add .fns files to work around missing ACL support and missing gettext on macos 10.6
via 5c93542 add .fns files to work around missing ACL support
via c1e7965 remove .fns file for removed host sunX
via 561b560 remove .fns file for removed host snab
via d01f4eb remove .fns file for removed host SerNet-aix
via bc1a9ff remove .fns file for removed host samba-klop
via 3a207b2 remove .fns file for removed host qnx18
via 2f20f02 remove .fns file for removed host m104
via ea33a4b remove .fns file for removed host gwen
via b991646 remove .fns file for removed host gollum
via dd3f590 remove .fns file for removed host fjall
via 92f6d36 remove .fns file for removed host charis
via ae9443b remove .fns file for removed host burns
via 8a6f00c remove .fns file for removed host buildsamba02
via 5deb0c1 remove all references to samba_3_master and mark as a removed tree
from 13df6dc use https for extermal and protocol indepentent links for ourself
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 43b5c253e71bb83362c89942017b465555ec53af
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 14:46:42 2014 +1300
Add --without-gettext to restore Samba build on hpisgr8
commit c90aa48f0112f4c40f00357c1dc96e463004c5e7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 14:43:45 2014 +1300
Add --without-gettext to restore Samba build on SerNET-Tru64
commit e037a38d69bf7dd6e6d23600438ec2cf2a501f33
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 14:40:39 2014 +1300
Add --without-gettext to restore Samba build on SerNet-IRIX
commit 404b035f28b6ab9fdf4edc5b4deca2885f71c7c8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 14:31:55 2014 +1300
add .fns files to work around missing ACL support and missing gettext on macos 10.6
commit 5c935426bd0c5007ea0e523c1db3be449ecb0b6f
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 14:28:21 2014 +1300
add .fns files to work around missing ACL support
commit c1e79654493fa9ab03f0e31085c641b4e62bc2d7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:51:40 2014 +1300
remove .fns file for removed host sunX
commit 561b560df38027a7c9b87a6b690f604798948138
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:51:27 2014 +1300
remove .fns file for removed host snab
commit d01f4eb203ad28a27ddc6230cbbc865d7adff5b4
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:50:51 2014 +1300
remove .fns file for removed host SerNet-aix
commit bc1a9ff015f58bdb082080c69b5d115339ba19a2
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:50:31 2014 +1300
remove .fns file for removed host samba-klop
commit 3a207b27f9ca28cb53b8a6d75dc82f401796f837
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:50:07 2014 +1300
remove .fns file for removed host qnx18
commit 2f20f029f10897b4ecf0c68483f1b4790af2187a
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:49:53 2014 +1300
remove .fns file for removed host m104
commit ea33a4b55a557c3fb481ffb0d09cda3f82b86755
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:49:32 2014 +1300
remove .fns file for removed host gwen
commit b99164612a9e858515975e6e4d2523d88ad37f79
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:49:02 2014 +1300
remove .fns file for removed host gollum
commit dd3f590dd0085e021bed2fed94de32258ef59af7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:48:01 2014 +1300
remove .fns file for removed host fjall
commit 92f6d367df0f5a3ed3338f1aaeb4ac8bb1cd49e7
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:47:42 2014 +1300
remove .fns file for removed host charis
commit ae9443b8eace9858033247ebe99349883293cd23
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:47:05 2014 +1300
remove .fns file for removed host burns
commit 8a6f00c67c4719515f7b88fa95fee56d71f2bb45
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:46:54 2014 +1300
remove .fns file for removed host buildsamba02
commit 5deb0c12b8667d057bb329eac4d9ead5aa73c5d8
Author: Andrew Bartlett <abartlet at samba.org>
Date: Tue Jan 7 13:44:54 2014 +1300
remove all references to samba_3_master and mark as a removed tree
-----------------------------------------------------------------------
Summary of changes:
SerNet-IRIX.fns | 5 +-
gwen.fns => SerNet-NetBSD5.fns | 7 +-
SerNet-Tru64.fns | 22 ++++++-
SerNet-aix.fns | 26 --------
tridge.fns => SerNet-imini.fns | 4 +-
SerNet-solaris8.fns | 1 -
build_test.fns | 10 +---
buildsamba02.fns | 3 -
burns.fns | 7 --
charis.fns | 15 -----
coverage.fns | 1 -
fjall.fns | 30 ---------
generic.fns | 1 -
gollum.fns | 10 ---
hape.fns | 2 -
hpisgr8.fns | 26 +++++++-
tridge.fns => kilkenny.fns | 4 +-
m104.fns | 131 ----------------------------------------
qnx18.fns | 25 --------
samba-klop.fns | 3 -
snab.fns | 23 -------
sunX.fns | 29 ---------
tridge.fns | 1 -
web/trees.conf | 6 --
24 files changed, 60 insertions(+), 332 deletions(-)
rename gwen.fns => SerNet-NetBSD5.fns (72%)
delete mode 100644 SerNet-aix.fns
copy tridge.fns => SerNet-imini.fns (75%)
delete mode 100644 buildsamba02.fns
delete mode 100644 burns.fns
delete mode 100755 charis.fns
delete mode 100644 fjall.fns
delete mode 100644 gollum.fns
copy tridge.fns => kilkenny.fns (80%)
delete mode 100644 m104.fns
delete mode 100644 qnx18.fns
delete mode 100644 samba-klop.fns
delete mode 100644 snab.fns
delete mode 100644 sunX.fns
Changeset truncated at 500 lines:
diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 9475898..c845470 100644
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -15,11 +15,14 @@ for compiler in $compilers; do
#export config="--with-included-popt"
. common.fns
+ config="--without-gettext"
+ export config
test_tree samba_4_0_test . $compiler
+ config=""
+ export config
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
- test_tree samba_3_master source3 $compiler
done
global_unlock
diff --git a/gwen.fns b/SerNet-NetBSD5.fns
similarity index 72%
rename from gwen.fns
rename to SerNet-NetBSD5.fns
index 2722993..91c958f 100644
--- a/gwen.fns
+++ b/SerNet-NetBSD5.fns
@@ -2,17 +2,18 @@ per_run_hook
global_lock
-. install_python.fns
-compilers="gcc cc"
+compilers="gcc"
for compiler in $compilers; do
+
. common.fns
+ export config="--without-acl-support"
test_tree samba_4_0_test . $compiler
+ export config=""
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
- test_tree samba_3_master source3 $compiler
done
global_unlock
diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index b9c093d..4420604 100644
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -1,11 +1,29 @@
-compilers="cc"
+per_run_hook
+
+global_lock
MAXTIME=18000
SMBD_MAXTIME=8500
SAMBA_MAXTIME=8500
export MAXTIME SMBD_MAXTIME SAMBA_MAXTIME
+compilers="cc"
+
CFLAGS="-g $CFLAGS"
export CFLAGS
-. generic.fns
+for compiler in $compilers; do
+
+ . common.fns
+
+ config="--without-gettext"
+ export config
+ test_tree samba_4_0_test . $compiler
+ config=""
+ export config
+
+ test_tree samba_3_current source3 $compiler
+ test_tree samba_3_next source3 $compiler
+done
+
+global_unlock
diff --git a/SerNet-aix.fns b/SerNet-aix.fns
deleted file mode 100644
index 8200976..0000000
--- a/SerNet-aix.fns
+++ /dev/null
@@ -1,26 +0,0 @@
-per_run_hook
-
-global_lock
-
-# get the newer version of python
-PATH=/opt/home/tridge/python/bin:$PATH
-export PATH
-
-compiler="cc"
-
-. common.fns
-
-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 pidl . cc build test
-
-compiler="xlc_r"
-test_tree samba_4_0_test . $compiler
-
-global_unlock
-
-# as long as killbysubdir doesn't work on AIX, let's killall our build user's
-# background processes:
-killall -
diff --git a/tridge.fns b/SerNet-imini.fns
similarity index 75%
copy from tridge.fns
copy to SerNet-imini.fns
index f598200..016cc61 100644
--- a/tridge.fns
+++ b/SerNet-imini.fns
@@ -5,13 +5,15 @@ global_lock
compilers="gcc"
for compiler in $compilers; do
+
. common.fns
+ export config="--without-acl-support --without-gettext"
test_tree samba_4_0_test . $compiler
+ export config=""
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
- test_tree samba_3_master source3 $compiler
done
global_unlock
diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index 66464f4..0788ce8 100644
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -37,7 +37,6 @@ for compiler in $compilers; do
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
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
done
diff --git a/build_test.fns b/build_test.fns
index ded4d09..de2023e 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -320,9 +320,6 @@ action_lcovreport() {
lorikeet-heimdal*)
lcov --directory $builddir --capture --output-file $builddir/$tree.lcov.info
;;
- samba_3_master*)
- lcov --base-directory $builddir --directory $builddir/.. --capture --output-file $builddir/$tree.lcov.info
- ;;
samba_4*|tdb*|talloc|ldb|libreplace)
lcov --base-directory $builddir/bin --directory $builddir/bin --capture --output-file $builddir/$tree.lcov.info
;;
@@ -349,7 +346,7 @@ action_callcatcherreport() {
tdb*|talloc|ldb)
callanalyse `find $builddir/bin -name \*.so*` $builddir/bin/* > $builddir/coverage/unused-fns.txt
;;
- samba_3_master|samba_4*)
+ samba_4*)
callanalyse `find $builddir/bin -name \*.so*` $builddir/bin/* > $builddir/coverage/all-unused-fns.txt
grep -v -f $srcdir/callcatcher-exceptions.grep $builddir/coverage/all-unused-fns.txt > $builddir/coverage/unused-fns.txt
;;
@@ -756,9 +753,6 @@ test_tree() {
samba_4*)
sw_config="$config --enable-selftest"
;;
- samba_3_master)
- sw_config="$config --enable-selftest"
- ;;
samba_3*)
sw_config="$config --enable-socket-wrapper"
sw_config="$sw_config --enable-nss-wrapper"
@@ -1052,7 +1046,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 samba_3_waf"
+ old_trees="$old_tree samba_3_X_test samba_3_X_devel samba_3_X_devel samba_3_waf samba_3_master"
for d in $old_trees; do
delete_old_tree $d
done
diff --git a/buildsamba02.fns b/buildsamba02.fns
deleted file mode 100644
index 13228ca..0000000
--- a/buildsamba02.fns
+++ /dev/null
@@ -1,3 +0,0 @@
- unset TEST_LDAP
- unset TEST_OPTIONS
-. generic.fns
diff --git a/burns.fns b/burns.fns
deleted file mode 100644
index 60e8764..0000000
--- a/burns.fns
+++ /dev/null
@@ -1,7 +0,0 @@
-
-MAXTIME=28800 # 8 hours
-SMBD_MAXTIME=25200 # 7 hours for a samba process ..
-# default maximum memory size (100M) for any command
-export MAXTIME SMBD_MAXTIME
-
-. generic.fns
diff --git a/charis.fns b/charis.fns
deleted file mode 100755
index f3cad96..0000000
--- a/charis.fns
+++ /dev/null
@@ -1,15 +0,0 @@
-export MAKE="make"
-export MAKEFLAGS="-j16"
-
-per_run_hook
-
-global_lock
-
-system=`uname`
-
-compiler=gcc
-test_tree samba_4_0_test . gcc
-export config="--enable-merged-build"
-test_tree samba_3_master source3 gcc
-
-global_unlock
diff --git a/coverage.fns b/coverage.fns
index 0846b23..506df93 100644
--- a/coverage.fns
+++ b/coverage.fns
@@ -17,6 +17,5 @@ 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
global_unlock
diff --git a/fjall.fns b/fjall.fns
deleted file mode 100644
index 4398ba8..0000000
--- a/fjall.fns
+++ /dev/null
@@ -1,30 +0,0 @@
-per_run_hook
-
-export CFLAGS="-Wall -g"
-
-compiler=gcc
-
-# do most packages
-. common.fns
-
-# now the valgrind ones
-export SMBD_VALGRIND="valgrind -q --num-callers=30 --log-file=st/valgrind.log_%p --gen-suppressions=all --suppressions=.valgrind_suppressions"
-export NMBD_VALGRIND="valgrind -q --num-callers=30 --log-file=st/valgrind.log_%p --gen-suppressions=all --suppressions=.valgrind_suppressions"
-export WINBINDD_VALGRIND="valgrind -q --num-callers=30 --log-file=st/valgrind.log_%p --gen-suppressions=all --suppressions=.valgrind_suppressions"
-export SAMBA_VALGRIND="valgrind -q --num-callers=30 --log-file=st/valgrind.log_%p --gen-suppressions=all --suppressions=.valgrind_suppressions"
-export VALGRIND="valgrind -q --num-callers=30 --log-file=st/valgrind.log_%p --gen-suppressions=all --suppressions=.valgrind_suppressions"
-
-# 2 hours
-export TORTURE_MAXTIME=7200
-# 10 hours
-export MAXTIME=36000
-export SMBD_MAXTIME=36000
-export SAMBA_MAXTIME=36000
-
-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
-
-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 46f552a..74e1a67 100644
--- a/generic.fns
+++ b/generic.fns
@@ -63,7 +63,6 @@ for compiler in $compilers; do
export TDB_NO_FSYNC
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
- test_tree samba_3_master source3 $compiler
TDB_NO_FSYNC=0
export TDB_NO_FSYNC
diff --git a/gollum.fns b/gollum.fns
deleted file mode 100644
index 63bfc1f..0000000
--- a/gollum.fns
+++ /dev/null
@@ -1,10 +0,0 @@
-CFLAGS="-g $CFLAGS"
-export CFLAGS
-MAXTIME=32400 # 9 hours
-SMBD_MAXTIME=25200 # 7 hours for a samba process ..
-# default maximum memory size (100M) for any command
-export MAXTIME SMBD_MAXTIME
-compilers="gcc cc"
-export compilers
-
-. generic.fns
diff --git a/hape.fns b/hape.fns
index eda75d6..5ddfa25 100644
--- a/hape.fns
+++ b/hape.fns
@@ -25,8 +25,6 @@ for compiler in gcc ; do
test_tree samba_3_current source3 $compiler
export config="--with-acl-support --with-libiconv=/usr/local --with-included-popt"
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
done
diff --git a/hpisgr8.fns b/hpisgr8.fns
index 95e6884..26f2458 100644
--- a/hpisgr8.fns
+++ b/hpisgr8.fns
@@ -1,6 +1,28 @@
-
# gdb is in /opt/langtools/bin
PATH="$PATH:/opt/langtools/bin"
export PATH
-. generic.fns
+per_run_hook
+
+global_lock
+
+compilers="cc gcc"
+
+CFLAGS="-g $CFLAGS"
+export CFLAGS
+
+for compiler in $compilers; do
+
+ . common.fns
+
+ config="--without-gettext"
+ export config
+ test_tree samba_4_0_test . $compiler
+ config=""
+ export config
+
+ test_tree samba_3_current source3 $compiler
+ test_tree samba_3_next source3 $compiler
+done
+
+global_unlock
diff --git a/tridge.fns b/kilkenny.fns
similarity index 80%
copy from tridge.fns
copy to kilkenny.fns
index f598200..91c958f 100644
--- a/tridge.fns
+++ b/kilkenny.fns
@@ -5,13 +5,15 @@ global_lock
compilers="gcc"
for compiler in $compilers; do
+
. common.fns
+ export config="--without-acl-support"
test_tree samba_4_0_test . $compiler
+ export config=""
test_tree samba_3_current source3 $compiler
test_tree samba_3_next source3 $compiler
- test_tree samba_3_master source3 $compiler
done
global_unlock
diff --git a/m104.fns b/m104.fns
deleted file mode 100644
index e9b03d6..0000000
--- a/m104.fns
+++ /dev/null
@@ -1,131 +0,0 @@
-# Build control file for Stratus VOS
-# Contact: Paul.Green at stratus.com (paulg at samba.org)
-
-export CC="gcc"
-export CFLAGS=""
-export CPPFLAGS="-D_POSIX_C_SOURCE=200112L -D_SYSV -D_VOS_EXTENDED_NAMES"
-export MAXTIME=14400
-export TIMELIMIT_FLAGS="-D_POSIX_C_SOURCE=200112L"
-export noclean="yes"
-
-# avoid vos bug bin-340
-export LDFLAGS="-specs=/s/pg/bf/posix/command_library/pg.specs"
-
-# avoid vos bug ac-79
-export ac_cv_prog_cc_ccache_c_o=yes
-
-# ensure vos pathnames do not contain % or # characters
-# workaround until vos suggestion posix-1014 is implemented
-test_root=/build_farm
-
-############################
-# configure the tree
-# VOS: modified to print message and invoke bash explicitly
-action_configure() {
- echo " "
- echo "NOTE: VOS has some restrictions that cause build or test"
- echo " failures. I am working to resolve these."
- echo " 1. VOS does not implement Unix-domain sockets."
- echo " 2. VOS is missing some POSIX or Unix functions. I am"
- echo " supplying private versions to avoid build errors."
- echo " 3. VOS implements the POSIX-style shared memory API,"
- echo " not the System V-style shared memory API."
- echo " 4. VOS seems to have some bugs in POSIX file locking."
- echo " "
- echo "The following differences from standard POSIX systems are"
- echo "essentially unfixable:"
- echo " 5. VOS has symbolic links not hard links. link() is a dummy."
- echo " 6. VOS has a 256-character limit on pathnames."
- echo " 7. VOS does not implement shared libraries (no gcc -shared)."
- echo " "
- echo "Please contact Paul dot Green at stratus.com for further information."
- echo " "
- if [ ! -x $srcdir/configure ]; then
- ls -l $srcdir/configure
- echo "$srcdir/configure is missing"
- cstatus=255
- echo "CONFIGURE STATUS: $cstatus"
- return $cstatus;
- fi
- echo "CPPFLAGS=$CPPFLAGS"
- echo "CFLAGS=$CFLAGS"
- echo configure options: $config_and_prefix
- echo CC="$CCACHE $compiler" $srcdir/configure $config_and_prefix
- CC="$CCACHE $compiler"
- export CC
-# VOS: explicitly invoke bash here.
- ./timelimit $MAXTIME bash $srcdir/configure $config_and_prefix
- cstatus=$?
- if [ x"$cstatus" != x"0" ]; then
- if [ -f config.log ]; then
- echo "contents of config.log:"
- cat config.log
- fi
- fi
- echo "CONFIGURE STATUS: $cstatus"
- return $cstatus;
-}
-
-############################
-# VOS: apply any pending patches.
-apply_patches() {
- tree=$1
- if [ -f $tree.patch.txt ]; then
- cd $tree
- echo "Patching $tree with local changes."
- ../patch -u -b -p 2 -i ../$tree.patch.txt
- cd ..
- fi
-}
-
-############################
-# VOS: fake up df command, since VOS doesn't have it.
-function df {
- display_disk_info;
-}
-
-############################
-# fetch the latest copy of the tree
-# VOS: apply local patches to the tree, skip files w/long names.
-fetch_tree() {
- if [ "$norsync" = "yes" ]; then
- echo "skipping tree transfer"
- else
- fetchtree=$1
- if rsync --exclude=autom4te.cache/ --exclude=.svn/ --exclude=.git/ --delete-excluded -q --partial --timeout=200 -crlpz --delete --ignore-errors \
- samba.org::ftp/unpacked/$fetchtree/ $test_root/$fetchtree; then
- echo "transferred $fetchtree OK"
- else
- echo "transfer of $fetchtree failed code $?"
- return 1
- fi
- fi
- apply_patches "$fetchtree"
- return 0
-}
-
-############################
-# VOS: fake up mount command, since VOS doesn't have it.
-mount() {
--
build.samba.org
More information about the samba-cvs
mailing list