[PATCH 3/3] s3-build: Finish to correct the Makefile.in so that it works on buildfarm

[Matthieu Patou]

---
 source3/Makefile.in |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 10c9fea..42ea504 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -55,6 +55,7 @@ WINBIND_NSS_LDSHFLAGS=$(PICFLAG) @WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@ -lc @LDSHFLAG
 AWK=@AWK@
 DYNEXP=@DYNEXP@
 PERL=@PERL@
+PYTHON=@PYTHON@
 LIBDL=@LIBDL@
 
 PIDL_ARGS=@PIDL_ARGS@
@@ -3376,19 +3377,15 @@ selftestdir = ../selftest
 
 S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)"
 
-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) \
-		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) | \
-		$(PYTHON) $(selftestdir)/filter-subunit \
-		--expected-failures=$(srcdir)/selftest/knownfail | \
+		NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \
+		SELFTESTDIR="$(selftestdir)" SELFTESTPREFIX="$(selftest_prefix)" \
+		SOURCEDIR="$(srcdir)" \
+		RUN_FROM_BUILD_FARM="$(RUN_FROM_BUILD_FARM)" \
+		SUBUNIT_FORMATTER="$(SUBUNIT_FORMATTER)" \
+		PERL="$(PERL)" PYTHON="$(PYTHON)" \
 		$(selftestdir)/s3-selftest.sh
 
 test-%:
-- 
1.7.1


--------------040603020602050103000309--