summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2010-08-22 22:55:01 +0200
committerAndreas Schneider <asn@samba.org>2010-08-22 23:04:28 +0200
commit0d9460a3680258744de8ecd42a90c3ba1e42832f (patch)
tree4458ae73ee189d29c552f5aa64832723822de9c9
parentd8734c3c03ca3cd501b064c5f3b4684e62e751d6 (diff)
downloadsamba-0d9460a3680258744de8ecd42a90c3ba1e42832f.tar.gz
samba-0d9460a3680258744de8ecd42a90c3ba1e42832f.tar.bz2
samba-0d9460a3680258744de8ecd42a90c3ba1e42832f.zip
s3-build: Add a test-buildfarm target to stay UNIX Makefile compatible.
-rw-r--r--source3/Makefile.in6
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index ce6b5ff1cf..96cf44f74c 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=$*