summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2013-05-22 16:13:21 +1000
committerAndrew Bartlett <abartlet@samba.org>2013-05-28 12:17:12 +1000
commit26d36befa8347eb093850cc8853fd9939555d458 (patch)
treeb08770597cba0aed430b36b6a69e6a9d65d8eccc
parentcbddf9e2efd856a25c6405f6893ad3a9cda1b181 (diff)
downloadsamba-26d36befa8347eb093850cc8853fd9939555d458.tar.gz
samba-26d36befa8347eb093850cc8853fd9939555d458.tar.bz2
samba-26d36befa8347eb093850cc8853fd9939555d458.zip
selftest: VFSLIBDIR is not needed, the waf build knows where to find modules automatically
This is why was relinks on install, because it is fixing these internal variables up. Andrew Bartlett Reviewed-by: Jelmer Vernooij <jelmer@samba.org> Reviewed-by: David Disseldorp <ddiss@samba.org>
-rwxr-xr-xselftest/target/Samba3.pm16
-rw-r--r--selftest/wscript1
2 files changed, 7 insertions, 10 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index f90738617d..91a8133e71 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -413,7 +413,6 @@ sub setup_admember_rfc2307($$$$)
sub setup_simpleserver($$)
{
my ($self, $path) = @_;
- my $vfs_modulesdir_abs = $ENV{VFSLIBDIR};
print "PROVISIONING server with security=share...";
@@ -421,11 +420,11 @@ sub setup_simpleserver($$)
my $simpleserver_options = "
lanman auth = yes
- vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
+ vfs objects = xattr_tdb streams_depot
[vfs_aio_fork]
path = $prefix_abs/share
- vfs objects = $vfs_modulesdir_abs/aio_fork.so
+ vfs objects = aio_fork
read only = no
vfs_aio_fork:erratic_testing_mode=yes
";
@@ -781,7 +780,6 @@ sub provision($$$$$$)
my $prefix_abs = abs_path($prefix);
my $bindir_abs = abs_path($self->{bindir});
- my $vfs_modulesdir_abs = ($ENV{VFSLIBDIR} or $bindir_abs);
my $dns_host_file = "$ENV{SELFTEST_PREFIX}/dns_host_file";
@@ -988,7 +986,7 @@ sub provision($$$$$$)
store dos attributes = yes
create mask = 755
dos filemode = yes
- vfs objects = $vfs_modulesdir_abs/acl_xattr.so $vfs_modulesdir_abs/fake_acls.so $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
+ vfs objects = acl_xattr fake_acls xattr_tdb streams_depot
printing = vlp
print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s
@@ -1026,7 +1024,7 @@ sub provision($$$$$$)
path = $shrdir
comment = encrypt smb username is [%U]
smb encrypt = required
- vfs objects = $vfs_modulesdir_abs/dirsort.so
+ vfs objects = dirsort
[tmpguest]
path = $shrdir
guest ok = yes
@@ -1086,13 +1084,13 @@ sub provision($$$$$$)
path = $shrdir
comment = smb username is [%U]
nfs4:mode = simple
- vfs objects = $vfs_modulesdir_abs/nfs4acl_xattr.so $vfs_modulesdir_abs/xattr_tdb.so
+ vfs objects = nfs4acl_xattr xattr_tdb
[nfs4acl_special]
path = $shrdir
comment = smb username is [%U]
nfs4:mode = special
- vfs objects = $vfs_modulesdir_abs/nfs4acl_xattr.so $vfs_modulesdir_abs/xattr_tdb.so
+ vfs objects = nfs4acl_xattr xattr_tdb
[xcopy_share]
path = $shrdir
@@ -1106,7 +1104,7 @@ sub provision($$$$$$)
force create mode = 0
directory mask = 0777
force directory mode = 0
- vfs objects = $vfs_modulesdir_abs/xattr_tdb.so
+ vfs objects = xattr_tdb
[print\$]
copy = tmp
diff --git a/selftest/wscript b/selftest/wscript
index c7637a19ac..0c2fec8463 100644
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -179,7 +179,6 @@ def cmd_testonly(opt):
os.environ['LDB_MODULES_PATH'] = 'bin/modules/ldb'
# tell build system where to find config.h
- os.environ['VFSLIBDIR'] = os.path.abspath('bin/modules/vfs')
os.environ['CONFIG_H'] = 'bin/default/include/config.h'
st_done = os.path.join(env.SELFTEST_PREFIX, 'st_done')