[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  6534358 selftest: When running on the buildfarm, pipe everything through filter-subunit for the exit code.
       via  7f32c21 selftest: Even if setting up an environment failed, the next tests may still work.
      from  bbd77cb subunithelper: Exit with 1 if more than zero testsuites failed or errorred.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6534358a1ae0e3540f84ebc531519fe5c5711ad3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 21 23:09:49 2010 +0100

    selftest: When running on the buildfarm, pipe everything through
    filter-subunit for the exit code.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sun Nov 21 23:56:23 CET 2010 on sn-devel-104

commit 7f32c21ef0cea606eaf86d36812ba596d65844fc
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 21 22:06:02 2010 +0100

    selftest: Even if setting up an environment failed, the next tests may
    still work.

-----------------------------------------------------------------------

Summary of changes:
 selftest/selftest.pl     |    1 -
 source4/selftest/wscript |    2 ++
 2 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 0087ec1..d82930d 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -952,7 +952,6 @@ $envvarstr
 			Subunit::start_testsuite($name);
 			Subunit::end_testsuite($name, "error",
 				"unable to set up environment $envname - exiting");
-			exit(1);
 			next;
 		}
 
diff --git a/source4/selftest/wscript b/source4/selftest/wscript
index a5fafa3..e6b75d1 100644
--- a/source4/selftest/wscript
+++ b/source4/selftest/wscript
@@ -161,6 +161,8 @@ def cmd_testonly(opt):
     cmd = '(${PERL} %s/../selftest/selftest.pl --prefix=${SELFTEST_PREFIX} --builddir=. --srcdir=. --exclude=./selftest/skip --testlist="${PYTHON} ./selftest/tests.py|" ${OPTIONS} --socket-wrapper ${TESTS} && touch ${SELFTEST_PREFIX}/st_done) | ${FILTER_OPTIONS} | tee ${SELFTEST_PREFIX}/subunit' % (os.getcwd())
     if os.environ.get('RUN_FROM_BUILD_FARM') is None and not Options.options.FILTERED_SUBUNIT:
         cmd += ' | ${FORMAT_TEST_OUTPUT}'
+    else:
+        cmd += ' | ${PYTHON} -u ../selftest/filter-subunit'
     cmd = EXPAND_VARIABLES(opt, cmd)
 
     print("test: running %s" % cmd)


-- 
Samba Shared Repository