From bc42f251c3c0a2fd33e4b8487410f61392f8dcc3 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 21 Jan 2009 10:15:22 +0100
Subject: merged-build: propare to fix make test4

metze
---
 source3/samba4.mk | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source3/samba4.mk b/source3/samba4.mk
index c79694edb0..49afa3a2e2 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -170,8 +170,11 @@ everything:: $(patsubst %,%4,$(BINARIES))
 setup:
 	@ln -sf ../source4/setup setup
 
-SELFTEST4 = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \
+LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared"
+
+SELFTEST4 = $(LD_LIBPATH_OVERRIDE) EXEEXT="4" $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \
     --builddir=$(builddir) --srcdir=$(samba4srcdir) \
+    --exeext=4 \
     --expected-failures=$(samba4srcdir)/selftest/knownfail \
 	--format=$(SELFTEST_FORMAT) \
     --exclude=$(samba4srcdir)/selftest/skip --testlist="$(samba4srcdir)/selftest/tests.sh|" \
-- 
cgit