sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-22 22:04:08 +03:00
Code

s3-selftest: support differing VFSLIBDIR in autoconf and waf build.

Browse Source 
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
This commit is contained in:
Günther Deschner 2010-12-10 17:15:18 +01:00
parent b4d398f8e3
commit a43a1d9226
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
selftest/target/Samba3.pm
View File

@ -356,7 +356,7 @@ sub provision($$$$$$)
my $prefix_abs = abs_path($prefix);
my $bindir_abs = abs_path($self->{bindir});
my $vfs_modulesdir_abs = $bindir_abs;
my $vfs_modulesdir_abs = ($ENV{VFSLIBDIR} or $bindir_abs);
my @dirs = ();

1
source3/Makefile.in
View File

@ -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)" \

1
source3/selftest/wscript
View File

@ -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):