summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-12-10 17:15:18 +0100
committerGünther Deschner <gd@samba.org>2010-12-13 13:06:05 +0100
commita43a1d922611a0610f8d815285e91dff6d77d629 (patch)
tree61d2b9dd5e39699f3443baa7f1c79c76de101f9a /source3
parentb4d398f8e3f5f073f0424395b792c1487a2f2ca8 (diff)
downloadsamba-a43a1d922611a0610f8d815285e91dff6d77d629.tar.gz
samba-a43a1d922611a0610f8d815285e91dff6d77d629.tar.bz2
samba-a43a1d922611a0610f8d815285e91dff6d77d629.zip
s3-selftest: support differing VFSLIBDIR in autoconf and waf build.
With this change make test in the s3 waf build (w/o s4 smbtorture yet) works! Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Mon Dec 13 13:06:05 CET 2010 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in1
-rw-r--r--source3/selftest/wscript1
2 files changed, 2 insertions, 0 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 61ec15788d..1525888693 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3413,6 +3413,7 @@ test:: all torture timelimit
NSS_WRAPPER_WINBIND_SO_PATH="$(srcdir)/../nsswitch/libnss_winbind.so" \
SELFTESTDIR="$(selftestdir)" SELFTESTPREFIX="$(selftest_prefix)" \
SOURCEDIR="$(srcdir)" \
+ VFSLIBDIR="$(builddir)/bin" \
RUN_FROM_BUILD_FARM="$(RUN_FROM_BUILD_FARM)" \
SUBUNIT_FORMATTER="$(SUBUNIT_FORMATTER)" \
PERL="$(PERL)" PYTHON="$(PYTHON)" \
diff --git a/source3/selftest/wscript b/source3/selftest/wscript
index b3139d531c..0e3ee9ed64 100644
--- a/source3/selftest/wscript
+++ b/source3/selftest/wscript
@@ -120,6 +120,7 @@ def cmd_testonly(opt):
# tell build system where to find config.h
os.environ['CONFIG_H'] = 'bin/default/source3/include/config.h'
+ os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs')
st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')
if os.path.exists(st_done):