diff options
| author | Günther Deschner <gd@samba.org> | 2010-10-26 15:26:17 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-10-28 14:33:19 +0000 |
| commit | 9dd467b2d578434c14e4a057fd27d36aafed8563 (patch) | |
| tree | 096c3685b43dcbdf9a55d3a7c172f3cbcbc789e0 | |
| parent | 4b2e2f94bb505f3de6411cfc8e01d05b010a2819 (diff) | |
| download | samba-9dd467b2d578434c14e4a057fd27d36aafed8563.tar.gz samba-9dd467b2d578434c14e4a057fd27d36aafed8563.tar.bz2 samba-9dd467b2d578434c14e4a057fd27d36aafed8563.zip | |
s3-selftest: add vfs_modulesdir variable for both test systems.
Guenther
| -rw-r--r-- | selftest/target/Samba3.pm | 3 | ||||
| -rwxr-xr-x | source3/script/tests/selftest.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index c03e188792..4c554b5814 100644 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -356,6 +356,7 @@ sub provision($$$$$$) my $prefix_abs = abs_path($prefix); my $bindir_abs = abs_path($self->{bindir}); + my $vfs_modulesdir_abs = $bindir_abs; my @dirs = (); @@ -530,7 +531,7 @@ sub provision($$$$$$) map readonly = no store dos attributes = yes create mask = 755 - vfs objects = $bindir_abs/xattr_tdb.so $bindir_abs/streams_depot.so + vfs objects = $vfs_modulesdir_abs/xattr_tdb.so $vfs_modulesdir_abs/streams_depot.so printing = vlp print command = $bindir_abs/vlp tdbfile=$lockdir/vlp.tdb print %p %s diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index fba43e3306..e68f2085c2 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -87,6 +87,7 @@ SRCDIR="`dirname $0`/../.." BINDIR="`pwd`/bin" SCRIPTDIR=$SRCDIR/script/tests LIBDIR=$PREFIX_ABS/lib +VFS_MODULESDIR=$BINDIR PIDDIR=$PREFIX_ABS/pid CONFFILE=$LIBDIR/client.conf SAMBA4CONFFILE=$LIBDIR/samba4client.conf @@ -329,7 +330,7 @@ cat >$SERVERCONFFILE<<EOF map readonly = no store dos attributes = yes create mask = 755 - vfs objects = $BINDIR/xattr_tdb.so $BINDIR/streams_depot.so + vfs objects = $VFS_MODULESDIR/xattr_tdb.so $VFS_MODULESDIR/streams_depot.so printing = vlp print command = $BINDIR/vlp tdbfile=$LOCKDIR/vlp.tdb print %p %s |