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

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 3d1ae4e611c3d7d9eab2402e6148126ce98c61c8..279fc65c7bba309ec2e73607771119dfe8185ae0 100644 (file)
--- 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 61ec15788d529a12e51b7376b6c22c5d4163637f..1525888693a3c615999f0f9ec247d61548d0185d 100644 (file)
--- 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 b3139d531c6daba1d06f5c35a5fff3ec571527a3..0e3ee9ed641dd2f1f09c32b0a34fed38e319e6de 100644 (file)
--- 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):