From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 18 Apr 2012 06:05:22 +0000 (+1000)
Subject: selftest: attempt to test samba3hide in a different environment
X-Git-Tag: samba-4.0.0alpha21~433
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5baf11307fb2e95b2bfb05e8b74ca502cf3073ae;p=thirdparty%2Fsamba.git

selftest: attempt to test samba3hide in a different environment

This should ensure that the samba3hide test is still run and passes,
in a non-ACLed environment.

Andrew Bartlett
---

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index 245f3a964cb..b148167156c 100755
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -347,12 +347,14 @@ sub setup_admember($$$$)
 sub setup_secshare($$)
 {
 	my ($self, $path) = @_;
+	my $vfs_modulesdir_abs = $ENV{VFSLIBDIR};
 
 	print "PROVISIONING server with security=share...";
 
 	my $secshare_options = "
 	security = share
 	lanman auth = yes
+	vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so
 ";
 
 	my $vars = $self->provision($path,
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 8073e99a38c..ab16a481980 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -284,6 +284,9 @@ for t in tests:
     elif t == "raw.composite":
         plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
         plansmbtorturetestsuite(t, "plugin_s4_dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+    elif t == "raw.samba3hide":
+        plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
+        plansmbtorturetestsuite(t, "secshare", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')
     else:
         plansmbtorturetestsuite(t, "s3dc", '//$SERVER_IP/tmp -U$USERNAME%$PASSWORD')