[PATCH 2/3] s3-build: Use a wrapper script to run the tests.

Matthieu Patou mat at matws.net
Sat Oct 16 13:41:02 MDT 2010


Adapt the changeset 2eff142c from Andreas to make it apply to 3.6 branch
This fixes the buildfarm and returns the correct exit code of selftest.
---
 selftest/s3-selftest.sh |   44 ++++++++++++++++++++++++++++++++++++++++++++
 source3/Makefile.in     |    3 +--
 2 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100755 selftest/s3-selftest.sh

diff --git a/selftest/s3-selftest.sh b/selftest/s3-selftest.sh
new file mode 100755
index 0000000..8b44629
--- /dev/null
+++ b/selftest/s3-selftest.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+FILTER_XFAIL="${PYTHON} -u ${SELFTESTDIR}/filter-subunit --expected-failures=${SOURCEDIR}/selftest/knownfail"
+SUBUNIT_FORMATTER="${PYTHON} -u ${SELFTESTDIR}/format-subunit --prefix=${SELFTESTPREFIX} --immediate"
+FORMAT_TEST_OUTPUT="${FILTER_XFAIL} | ${SUBUNIT_FORMATTER}"
+
+cleanup_and_exit() {
+	if test "$1" = 0 -o -z "$1"; then
+		exit 0
+	else
+		exit $1
+	fi
+}
+
+st_test_done() {
+	test -f ${SELFTESTPREFIX}/st_done || { echo "SELFTEST FAILED"; cleanup_and_exit 1; }
+}
+
+if [ "x${RUN_FROM_BUILD_FARM}" = "xyes" ]; then
+	( rm -f ${SELFTESTPREFIX}/st_done && \
+		${PERL} ${SELFTESTDIR}/selftest.pl \
+			--prefix=${SELFTESTPREFIX} --target=samba3 \
+			--testlist="${SOURCEDIR}/selftest/tests.sh|" \
+			--exclude=${SOURCEDIR}/selftest/skip \
+			--socket-wrapper ${TESTS} \
+	&& touch ${SELFTESTPREFIX}/st_done ) | \
+		${FILTER_XFAIL} --strip-passed-output
+
+	st_test_done
+	test -f ${SELFTESTPREFIX}/summary && cat ${SELFTESTPREFIX}/summary
+else
+	( rm -f ${SELFTESTPREFIX}/st_done && \
+		${PERL} ${SELFTESTDIR}/selftest.pl \
+			--prefix=${SELFTESTPREFIX} --target=samba3 \
+			--testlist="${SOURCEDIR}/selftest/tests.sh|" \
+			--exclude=${SOURCEDIR}/selftest/skip \
+			--socket-wrapper ${TESTS} \
+	&& touch ${SELFTESTPREFIX}/st_done ) | \
+		${SUBUNIT_FORMATTER}
+
+	st_test_done
+fi
+
+cleanup_and_exit
diff --git a/source3/Makefile.in b/source3/Makefile.in
index ba75c9e..10c9fea 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3381,7 +3381,6 @@ SUBUNIT_FORMATTER = $(PYTHON) $(selftestdir)/format-subunit --immediate
 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 \
@@ -3390,7 +3389,7 @@ test:: all torture timelimit
 		--socket-wrapper $(TESTS) | \
 		$(PYTHON) $(selftestdir)/filter-subunit \
 		--expected-failures=$(srcdir)/selftest/knownfail | \
-		$(SUBUNIT_FORMATTER)
+		$(selftestdir)/s3-selftest.sh
 
 test-%:
 	$(MAKE) test TESTS=$*
-- 
1.7.1


--------------040603020602050103000309
Content-Type: text/x-patch;
 name="0001-s3-Fix-broken-make-tests-on-some-build-servers.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0001-s3-Fix-broken-make-tests-on-some-build-servers.patch"



More information about the samba-technical mailing list