[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  0d9460a... s3-build: Add a test-buildfarm target to stay UNIX Makefile compatible.
      from  d8734c3... s3:param Clarify parameter name on init_globals()

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


- Log -----------------------------------------------------------------
commit 0d9460a3680258744de8ecd42a90c3ba1e42832f
Author: Andreas Schneider <asn at samba.org>
Date:   Sun Aug 22 22:55:01 2010 +0200

    s3-build: Add a test-buildfarm target to stay UNIX Makefile compatible.

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

Summary of changes:
 source3/Makefile.in |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index ce6b5ff..96cf44f 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3298,8 +3298,7 @@ FILTER_XFAIL = $(PYTHON) -u $(selftestdir)/filter-subunit --expected-failures=$(
 SUBUNIT_FORMATTER = $(PYTHON) -u $(selftestdir)/format-subunit --immediate
 FORMAT_TEST_OUTPUT = $(FILTER_XFAIL) | $(SUBUNIT_FORMATTER)
 
-ifeq ($(RUN_FROM_BUILD_FARM),yes)
-test:: all torture timelimit
+test-buildfarm:: all torture timelimit
 	@LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \
 		SAMBA4SHAREDDIR="$(builddir)/bin/shared" SMBTORTURE4=$(smbtorture4_path) \
 		PERL="$(PERL)" PYTHON="$(PYTHON)" \
@@ -3311,7 +3310,7 @@ test:: all torture timelimit
 		--socket-wrapper $(TESTS) | \
 		$(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) \
@@ -3323,7 +3322,6 @@ test:: all torture timelimit
 		--exclude=$(srcdir)/selftest/skip \
 		--socket-wrapper $(TESTS) | \
 		$(FORMAT_TEST_OUTPUT)
-endif
 
 test-%:
 	$(MAKE) test TESTS=$*


-- 
Samba Shared Repository