summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-01-21 10:15:22 +0100
committerStefan Metzmacher <metze@samba.org>2009-01-21 13:35:36 +0100
commitbc42f251c3c0a2fd33e4b8487410f61392f8dcc3 (patch)
tree35aa22c6c229742e42f29d00654b4c6168f224a9
parent6f6533aa81791d40b37a9e715c7b7669cc92a1c9 (diff)
downloadsamba-bc42f251c3c0a2fd33e4b8487410f61392f8dcc3.tar.gz
samba-bc42f251c3c0a2fd33e4b8487410f61392f8dcc3.tar.bz2
samba-bc42f251c3c0a2fd33e4b8487410f61392f8dcc3.zip
merged-build: propare to fix make test4
metze
-rw-r--r--source3/samba4.mk5
1 files changed, 4 insertions, 1 deletions
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|" \