The branch, master has been updated
via 3d447e0... s3-test: Try to fix the build farm subunit parsing.
from 98187fe... s3: Increase debug level for shutdown_other_smbds
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3d447e01603c9289d027730565c1771585b19dde
Author: Andreas Schneider <[email protected]>
Date: Sun Aug 15 13:17:36 2010 +0200
s3-test: Try to fix the build farm subunit parsing.
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1eb1dbb..755fdb2 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -55,6 +55,7 @@ WINBIND_NSS_LDSHFLAGS=$(PICFLAG) @WINBIND_NSS_LDSHFLAGS@
@LDFLAGS@ -lc @LDSHFLAG
a...@awk@
dyne...@dynexp@
pe...@perl@
+pyth...@python@
lib...@libdl@
pidl_ar...@pidl_args@
@@ -3297,8 +3298,11 @@ selftestdir = ../selftest
S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)"
+FILTER_XFAIL = $(PYTHON) -u $(selftestdir)/filter-subunit
--expected-failures=$(srcdir)/selftest/knownfail
SUBUNIT_FORMATTER = $(PYTHON) $(selftestdir)/format-subunit --immediate
+FORMAT_TEST_OUTPUT = $(FILTER_XFAIL) | $(SUBUNIT_FORMATTER)
+ifeq ($(RUN_FROM_BUILD_FARM),yes)
test:: all torture timelimit
@LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
SAMBA4SHAREDDIR="$(builddir)/bin/shared"
SMBTORTURE4=$(smbtorture4_path) \
@@ -3309,9 +3313,21 @@ test:: all torture timelimit
--testlist="$(srcdir)/selftest/tests.sh|" \
--exclude=$(srcdir)/selftest/skip \
--socket-wrapper $(TESTS) | \
- $(PYTHON) $(selftestdir)/filter-subunit \
- --expected-failures=$(srcdir)/selftest/knownfail | \
- $(SUBUNIT_FORMATTER)
+ $(FILTER_XFAIL) --strip-passed-output
+ test -f ${selftest_prefix}/summary && cat ${selftest_prefix}/summary
+else
+test:: all torture timelimit
+ @LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
+ SAMBA4SHAREDDIR="$(builddir)/bin/shared"
SMBTORTURE4=$(smbtorture4_path) \
+ PERL="$(PERL)" PYTHON="$(PYTHON)" \
+ NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/@WINBIND_NSS@" \
+ $(PERL) $(selftestdir)/selftest.pl \
+ --prefix=${selftest_prefix} --target=samba3 \
+ --testlist="$(srcdir)/selftest/tests.sh|" \
+ --exclude=$(srcdir)/selftest/skip \
+ --socket-wrapper $(TESTS) | \
+ $(FORMAT_TEST_OUTPUT)
+endif
test-%:
$(MAKE) test TESTS=$*
--
Samba Shared Repository
