[SCM] build.samba.org - branch master updated
Matthieu Patou
mat at samba.org
Tue Nov 23 11:31:38 MST 2010
The branch, master has been updated
via 5986dab Increase runtime on sunX
via 16f22d4 Increase runtime on sun8
via 40f47c3 Increase runtime on sunX
via 40abe96 Increase run time for default builds
via f19b9a2 Add a prehook for sun8 so that we can fix the bitfield pb with sunstudio
via 6fcd9b9 use $compiler instead of gcc to ease script evolution
via a3615a2 Go back to mostly generic build file
via f6a669d add paths to LD_LIBRARY_PATH and explain why we do so
via a98feb7 true64: simplify the build script to use generic + some variables
via 0a0f1ca Move to $compilers notation
via d0c93bb Remove obsolete tree
via 90a9dba Be more verbose when we finish process due to limit reached
via d71f98e Use TDB_NO_FSYNC also for s3 builds
via 210efda Add -g to cflags to have symbols, will be very usefull when facing segfault ...
via 9ad1718 Reformat
via 3d0c0ac Remove hack for lcov with heimdal files
via e6d1cf6 Add possibility to add pre and post action hooks
via 4c8e3d4 simple reformat
via 9a461f5 Execute lcovreport task and remove unexisting action "info"
via 5ac1801 Move the lcov report in a separate action
from 0db99c8 Remove now obsolete build.pl file.
http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5986dab33b686d459edfd12ccc4c1e8ca87f6dca
Author: Matthieu Patou <mat at matws.net>
Date: Tue Nov 23 21:26:23 2010 +0300
Increase runtime on sunX
commit 16f22d45b664256211196b742246c036842c7004
Author: Matthieu Patou <mat at matws.net>
Date: Tue Nov 23 21:25:48 2010 +0300
Increase runtime on sun8
commit 40f47c3a328799ded09b3ae788ebb10d20689d41
Author: Matthieu Patou <mat at matws.net>
Date: Tue Nov 23 21:23:54 2010 +0300
Increase runtime on sunX
commit 40abe964111660f6e10be3d6fb39559c80996d65
Author: Matthieu Patou <mat at matws.net>
Date: Tue Nov 23 21:09:42 2010 +0300
Increase run time for default builds
commit f19b9a2fddba7f41dd990b97d0a299fb7c342e62
Author: Matthieu Patou <mat at matws.net>
Date: Tue Nov 23 21:07:04 2010 +0300
Add a prehook for sun8 so that we can fix the bitfield pb with sunstudio
commit 6fcd9b91b57c5352509e5c23f4b91fdfa3bb9cb6
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 13:40:39 2010 +0300
use $compiler instead of gcc to ease script evolution
commit a3615a26e90d14a253d5def7a7126484e97beffc
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 13:38:38 2010 +0300
Go back to mostly generic build file
commit f6a669dab008f3301fa6fc0b46b6d0fa2a69fc81
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 13:38:24 2010 +0300
add paths to LD_LIBRARY_PATH and explain why we do so
commit a98feb790755c0b7d043b5927b35ae65633c7611
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 13:37:38 2010 +0300
true64: simplify the build script to use generic + some variables
commit 0a0f1cae7e5087dfac61eb08591f3af3236ec151
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 13:36:44 2010 +0300
Move to $compilers notation
commit d0c93bb50a9f65e01f244cda96be6ad1a9e52f6a
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 11:03:30 2010 +0300
Remove obsolete tree
commit 90a9dba3d3f068ea4127ae9720bb8e9be36d59cb
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 11:02:35 2010 +0300
Be more verbose when we finish process due to limit reached
commit d71f98ebf12c34151caba58585bb99b1465a48b1
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 11:00:35 2010 +0300
Use TDB_NO_FSYNC also for s3 builds
commit 210efda9c9614ed849189892bb5a7afad06b3867
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 10:59:50 2010 +0300
Add -g to cflags to have symbols, will be very usefull when facing segfault ...
commit 9ad1718296543beea2ced6af23155098fd8685ee
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 10:59:09 2010 +0300
Reformat
commit 3d0c0ac6ce419d82b8ee0737a50803b90cb0b591
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 10:52:15 2010 +0300
Remove hack for lcov with heimdal files
commit e6d1cf698e84ef362735adea75d77811a3bbe8af
Author: Matthieu Patou <mat at matws.net>
Date: Sun Nov 14 10:49:19 2010 +0300
Add possibility to add pre and post action hooks
commit 4c8e3d4c12bd27ea08c113803dfe15b8a19a1aed
Author: Matthieu Patou <mat at matws.net>
Date: Fri Nov 12 12:38:24 2010 +0300
simple reformat
commit 9a461f54249e68197e9430ba1b4ee7cf63dd10a7
Author: Matthieu Patou <mat at matws.net>
Date: Fri Nov 12 12:28:11 2010 +0300
Execute lcovreport task and remove unexisting action "info"
commit 5ac180137ce5c3e32ba096b7bb96755d08599de8
Author: Matthieu Patou <mat at matws.net>
Date: Fri Nov 12 12:37:02 2010 +0300
Move the lcov report in a separate action
-----------------------------------------------------------------------
Summary of changes:
SerNet-IRIX.fns | 4 ++-
SerNet-Tru64.fns | 19 ++-----------
SerNet-imini.fns | 4 ++-
SerNet-solaris8.fns | 26 +++++++++++++++---
build_test.fns | 73 +++++++++++++++++++++++++++++++++++---------------
buildsamba02.fns | 44 ++----------------------------
common.fns | 1 -
fjall.fns | 10 +++---
generic.fns | 26 +++++++++++++-----
gwen.fns | 3 +-
magni.fns | 2 +-
sunX.fns | 9 +++---
timelimit.c | 6 +++-
13 files changed, 121 insertions(+), 106 deletions(-)
Changeset truncated at 500 lines:
diff --git a/SerNet-IRIX.fns b/SerNet-IRIX.fns
index 0a464b6..4e07389 100644
--- a/SerNet-IRIX.fns
+++ b/SerNet-IRIX.fns
@@ -8,7 +8,9 @@ SMBD_MAXTIME=18000
SAMBA_MAXTIME=18000
export MAXTIME TORTURE_MAXTIME SMBD_MAXTIME SAMBA_MAXTIME
-for compiler in cc ; do
+compilers="cc"
+
+for compiler in $compilers; do
#export config="--with-included-popt"
. common.fns
diff --git a/SerNet-Tru64.fns b/SerNet-Tru64.fns
index 93eb042..629747d 100644
--- a/SerNet-Tru64.fns
+++ b/SerNet-Tru64.fns
@@ -1,21 +1,8 @@
-per_run_hook
-
-global_lock
-
-compiler=cc
+compilers=cc
MAXTIME=18000
-export MAXTIME
SMBD_MAXTIME=8500
-export SMBD_MAXTIME
SAMBA_MAXTIME=8500
-export SAMBA_MAXTIME
-
-. common.fns
-test_tree lorikeet-heimdal . $compiler
-CFLAGS="-g1 ${CFLAGS}" test_tree samba_4_0_test source4 $compiler
-CFLAGS="-g1 ${CFLAGS}" test_tree samba_3_current source $compiler
-CFLAGS="-g1 ${CFLAGS}" test_tree samba_3_next source $compiler
-CFLAGS="-g1 ${CFLAGS}" test_tree samba_3_master source $compiler
+export MAXTIME SMBD_MAXTIME SAMBA_MAXTIME
-global_unlock
+. generic.fns
diff --git a/SerNet-imini.fns b/SerNet-imini.fns
index 8f45fea..fee132f 100644
--- a/SerNet-imini.fns
+++ b/SerNet-imini.fns
@@ -2,7 +2,9 @@ per_run_hook
global_lock
-for compiler in gcc cc; do
+compilers="gcc cc"
+
+for compiler in $compilers; do
. common.fns
test_tree samba_4_0_test source4 $compiler
diff --git a/SerNet-solaris8.fns b/SerNet-solaris8.fns
index a096051..eac04b8 100644
--- a/SerNet-solaris8.fns
+++ b/SerNet-solaris8.fns
@@ -2,12 +2,30 @@ per_run_hook
global_lock
-MAXTIME=36000
+MAXTIME=42200
TORTURE_MAXTIME=3600
-SMBD_MAXTIME=18000
-SAMBA_MAXTIME=18000
-LD_LIBRARY_PATH=/usr/local/ssl/lib
+SMBD_MAXTIME=42200
+SAMBA_MAXTIME=42200
+
+# this is needed because python depends on openssl for some modules like hashlib
+# that in turn samba pretty much depends on
+# We need also /usr/local/lib for gcc as it needs libgcc_s.(so|a)
+
+LD_LIBRARY_PATH=/usr/local/ssl/lib:/usr/local/lib
export MAXTIME TORTURE_MAXTIME SMBD_MAXTIME SAMBA_MAXTIME LD_LIBRARY_PATH
+PREHOOKS="configure"
+
+prehook_configure()
+{
+case "$tree" in
+ samba_4*)
+ (cd ${builddir}/..; gpatch -p 1 <$HOME/build_farm/patch
+ ;;
+ *)
+ ;;
+esac
+}
+
compilers="cc gcc"
for compiler in $compilers; do
diff --git a/build_test.fns b/build_test.fns
index b5cb715..0e45a25 100644
--- a/build_test.fns
+++ b/build_test.fns
@@ -7,7 +7,7 @@
# Copyright (C) 2001, 2003 by Martin Pool <mbp at samba.org>
# default maximum runtime for any command
-MAXTIME=12000
+MAXTIME=25200 # 7 hours
# default maximum memory size (100M) for any command
MAXMEM=100000
RUN_FROM_BUILD_FARM=yes
@@ -289,6 +289,39 @@ do_make() {
return 0
}
+
+############################
+# do the coverage report
+############################
+
+action_lcovreport() {
+ if [ "$LCOV_REPORT" = "yes" ]; then
+ case "$tree" in
+ 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*)
+ # rm -f heimdal/lib/*/{lex,parse,sel-lex}.{gcda,gcno}
+ lcov --base-directory $builddir --directory $builddir/.. --capture --output-file $builddir/$tree.lcov.info
+ ;;
+ *)
+ lcov --base-directory $builddir --directory $builddir --capture --output-file $builddir/$tree.lcov.info
+ ;;
+ esac
+ genhtml -o $builddir/coverage $builddir/$tree.lcov.info
+ rc=$?
+ echo "return code: $rc"
+ else
+ echo "LCOV_REPORT not set and lcovreport asked"
+ echo "Most probably an error please fix !"
+ return 1
+ fi
+}
+
+
############################
# configure the tree
############################
@@ -774,9 +807,25 @@ test_tree() {
mount
vmstat
+ if [ "x$PREHOOKS" != "x" ]; then
+ for hooks in $PREHOOKS; do
+ if [ "x$hooks" = "x$action" ]; then
+ ( prehook_$action )
+ fi
+ done
+ fi
+
( action_$action )
action_status=$?
+ if [ "x$POSTHOOKS" != "x" ]; then
+ for hooks in $POSTHOOKS; do
+ if [ "x$hooks" = "x$action" ]; then
+ ( posthook_$action )
+ fi
+ done
+ fi
+
df .
if [ $action_status != 0 ]; then
@@ -791,26 +840,6 @@ test_tree() {
fi
done
- if [ "$LCOV_REPORT" = "yes" ]; then
- case "$tree" in
- 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*)
- # ugly hack for s4, as lcov is otherwise not able to find
- # these files
- rm -f heimdal/lib/*/{lex,parse,sel-lex}.{gcda,gcno}
- lcov --base-directory $builddir --directory $builddir/.. --capture --output-file $builddir/$tree.lcov.info
- ;;
- *)
- lcov --base-directory $builddir --directory $builddir --capture --output-file $builddir/$tree.lcov.info
- ;;
- esac
- genhtml -o $builddir/coverage $builddir/$tree.lcov.info
- fi
if [ "$noclean" = "yes" ]; then
echo cleanup skipped!
@@ -827,7 +856,7 @@ test_tree() {
if [ "$LCOV_REPORT" = "yes" ]; then
chmod u=rwX,g=rX,o=rX -R $builddir/coverage
rsync -rct -q --password-file=.password -z --timeout=200 \
- $builddir/coverage/ $host at build.samba.org::lcov_data/$host/$tree/
+ $builddir/coverage/ $host at build.samba.org::lcov_data/$host/$tree/
fi
cd $test_root
diff --git a/buildsamba02.fns b/buildsamba02.fns
index 365331c..13228ca 100644
--- a/buildsamba02.fns
+++ b/buildsamba02.fns
@@ -1,41 +1,3 @@
-per_run_hook
-
-global_lock
-
-#. install_python.fns
-
-action_test() {
- set
- env
- case $tree in
- samba_4*)
- unset TEST_LDAP
- unset TEST_OPTIONS
- ../buildtools/bin/waf test
- ;;
- *)
- do_make test
- ;;
- esac
- totalstatus=$?
-
- # if we produced a test summary then show it
- [ -f st/summary ] && {
- echo "TEST SUMMARY"
- cat st/summary
- }
-
- return "$totalstatus"
-}
-
-for compiler in gcc; do
- . common.fns
-
- test_tree samba_4_0_test source4 $compiler
-
- test_tree samba_3_current source $compiler
- test_tree samba_3_next source $compiler
- test_tree samba_3_master source $compiler
-done
-
-global_unlock
+ unset TEST_LDAP
+ unset TEST_OPTIONS
+. generic.fns
diff --git a/common.fns b/common.fns
index e1b7dc3..9ab15e9 100644
--- a/common.fns
+++ b/common.fns
@@ -11,5 +11,4 @@ test_tree ccache-maint . $compiler
test_tree talloc . $compiler
test_tree tdb . $compiler
test_tree ldb . $compiler
-test_tree smb-build . $compiler
diff --git a/fjall.fns b/fjall.fns
index 475c0dd..612a96b 100644
--- a/fjall.fns
+++ b/fjall.fns
@@ -21,10 +21,10 @@ export MAXTIME=36000
export SMBD_MAXTIME=36000
export SAMBA_MAXTIME=36000
-test_tree samba_4_0_test source4 gcc
-test_tree samba_3_current source gcc
-test_tree samba_3_next source gcc
-test_tree samba_3_master source gcc
+test_tree samba_4_0_test source4 $compiler
+test_tree samba_3_current source $compiler
+test_tree samba_3_next source $compiler
+test_tree samba_3_master source $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 . gcc
+test_tree lorikeet-heimdal . $compiler
diff --git a/generic.fns b/generic.fns
index dda794d..702f830 100644
--- a/generic.fns
+++ b/generic.fns
@@ -7,6 +7,11 @@ system=`uname`
ENVCFLAGS=$CFLAGS
cur_compiler_sum=""
last_compiler_sum=""
+
+if [ "x$compilers" = "x" ]; then
+ compilers="gcc cc icc"
+fi
+
for compiler in gcc cc icc; do
# arrgh, "which" gives no err code on solaris
@@ -26,21 +31,24 @@ for compiler in gcc cc icc; do
if $compiler -v 2>&1 | grep gcc.version > /dev/null; then
isgcc=1
- CFLAGS="$ENVCFLAGS -Wall"
+ CFLAGS="$ENVCFLAGS -Wall -g"
else
isgcc=0
- CFLAGS="$ENVCFLAGS"
+ CFLAGS="$ENVCFLAGS -g"
fi
+
CFLAGS_THIS_COMPILER=`eval CFLAGS_$compiler 2>/dev/null`
if [ $? = 0 ] ; then
- CFLAGS="$CFLAGS_THIS_COMPILER $CFLAGS"
+ CFLAGS="$CFLAGS_THIS_COMPILER $CFLAGS"
fi
export CFLAGS
- TDB_NO_FSYNC=1
- export TDB_NO_FSYNC
+
+ TDB_NO_FSYNC=1
+ export TDB_NO_FSYNC
test_tree samba_4_0_test source4 $compiler
- TDB_NO_FSYNC=0
- export TDB_NO_FSYNC
+ TDB_NO_FSYNC=0
+ export TDB_NO_FSYNC
+
if [ $compiler = gcc -o $isgcc = 0 ]; then
. common.fns
test_tree lorikeet-heimdal . $compiler
@@ -50,9 +58,13 @@ for compiler in gcc cc icc; do
test_tree samba-gtk . $compiler
fi
+ 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
+ TDB_NO_FSYNC=0
+ export TDB_NO_FSYNC
# by default build ppp only on SunOS or Linux systems
if [ "$system" = Linux -o "$system" = SunOS ]; then
diff --git a/gwen.fns b/gwen.fns
index 3bb1259..51219ce 100644
--- a/gwen.fns
+++ b/gwen.fns
@@ -3,8 +3,9 @@ per_run_hook
global_lock
. install_python.fns
+compilers="gcc cc"
-for compiler in gcc cc; do
+for compiler in $compilers; do
. common.fns
test_tree samba_4_0_test source4 $compiler
diff --git a/magni.fns b/magni.fns
index f9c2115..43ffe1f 100644
--- a/magni.fns
+++ b/magni.fns
@@ -10,7 +10,7 @@ compiler=gcc
#lcov like shared libraries
#export config="--disable-shared"
export PIDL_TESTS_SKIP=yes
-test_tree samba_4_0_test source4 $compiler configure config_log config_header build install test infos
+test_tree samba_4_0_test source4 $compiler configure config_log config_header build install test lcovreport
export config=""
test_tree samba_3_current source $compiler
diff --git a/sunX.fns b/sunX.fns
index 5bd3f46..60ff7f6 100644
--- a/sunX.fns
+++ b/sunX.fns
@@ -2,13 +2,14 @@ per_run_hook
global_lock
-MAXTIME=36000
+MAXTIME=42200 # 12 hours
TORTURE_MAXTIME=3600
-SMBD_MAXTIME=18000
-SAMBA_MAXTIME=18000
+SMBD_MAXTIME=42200
+SAMBA_MAXTIME=42200
export MAXTIME TORTURE_MAXTIME SMBD_MAXTIME SAMBA_MAXTIME
-for compiler in cc gcc; do
+compilers="cc gcc"
+for compiler in $compilers; do
#export config="--with-included-popt"
. common.fns
TDB_NO_FSYNC=1
diff --git a/timelimit.c b/timelimit.c
index 1d93807..7232ecf 100644
--- a/timelimit.c
+++ b/timelimit.c
@@ -36,16 +36,18 @@ static void sig_alrm_kill(int sig)
static void sig_alrm_term(int sig)
{
+ fprintf(stderr, "\nMaximum time expired in timelimit - sending TERM To child\n");
kill(-child_pid, SIGTERM);
- alarm(5);
signal(SIGALRM, sig_alrm_kill);
+ alarm(5);
}
static void sig_term(int sig)
{
+ fprintf(stderr, "\nReceived TERM/INT/QUIT signal\n");
kill(-child_pid, SIGTERM);
- alarm(1);
signal(SIGALRM, sig_alrm_kill);
+ alarm(1);
}
static void sig_usr1(int sig)
--
build.samba.org
More information about the samba-cvs
mailing list