diff options
| author | Günther Deschner <gd@samba.org> | 2010-12-10 17:15:18 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-12-13 13:06:05 +0100 |
| commit | a43a1d922611a0610f8d815285e91dff6d77d629 (patch) | |
| tree | 61d2b9dd5e39699f3443baa7f1c79c76de101f9a | |
| parent | b4d398f8e3f5f073f0424395b792c1487a2f2ca8 (diff) | |
| download | samba-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
| -rw-r--r-- | selftest/target/Samba3.pm | 2 | ||||
| -rw-r--r-- | source3/Makefile.in | 1 | ||||
| -rw-r--r-- | source3/selftest/wscript | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 3d1ae4e611..279fc65c7b 100644 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -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 = (); 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): |