From e7cf933d4168fc9c9aafb57c532868162c48a70d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 7 Nov 2007 01:32:25 +0100
Subject: r25887: Build Samba-specific ldb modules as dso's. (This used to be
 commit 9d73becbb24fbde2e319e18e84af35d9efaeefda)

---
 source4/selftest/env/Samba4.pm   | 2 ++
 source4/selftest/samba4_tests.sh | 4 ++--
 source4/selftest/selftest.pl     | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'source4/selftest')

diff --git a/source4/selftest/env/Samba4.pm b/source4/selftest/env/Samba4.pm
index bf8f35990c..d0f6d522e9 100644
--- a/source4/selftest/env/Samba4.pm
+++ b/source4/selftest/env/Samba4.pm
@@ -499,6 +499,7 @@ sub provision($$$$$$)
 	ncalrpc dir = $ncalrpcdir
 	lock dir = $lockdir
 	setup directory = $self->{setupdir}
+	modules dir = $self->{bindir}/modules
 	js include = $srcdir/scripting/libjs
 	winbindd socket directory = $winbindd_socket_dir
         winbind separator = /
@@ -646,6 +647,7 @@ nogroup:x:65534:nobody
 		DOMAIN => $domain,
 		USERNAME => $username,
 		REALM => $realm,
+		LDB_MODULES_PATH => "$self->{bindir}/modules/ldb",
 		PASSWORD => $password,
 		LDAPDIR => $ldapdir,
 		WINBINDD_SOCKET_DIR => $winbindd_socket_dir,
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 6b6a48769f..3fde4f3c2f 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -31,7 +31,7 @@ plantest "js.base" dc "$SCRIPTDIR/base.js" $CONFIGURATION
 plantest "js.samr" dc "$SCRIPTDIR/samr.js" $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD
 plantest "js.echo" dc "$SCRIPTDIR/echo.js" $CONFIGURATION ncalrpc: -U\$USERNAME%\$PASSWORD
 #plantest "ejsnet.js" dc "$SCRIPTDIR/ejsnet.js" $CONFIGURATION -U\$USERNAME%\$PASSWORD \$DOMAIN ejstestuser
-plantest "js.ldb" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION
+plantest "js.ldb" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION -d 10
 plantest "js.winreg" dc $samba4srcdir/scripting/bin/winreg $CONFIGURATION ncalrpc: 'HKLM' -U\$USERNAME%\$PASSWORD
 
 # Simple tests for LDAP and CLDAP
@@ -56,7 +56,7 @@ LDBDIR=$samba4srcdir/lib/ldb
 export LDBDIR
 plantest "ldb" none $LDBDIR/tests/test-tdb.sh
 
-plantest "js.ldap" dc $SCRIPTDIR/ldap.js $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD
+plantest "js.ldap" dc $SCRIPTDIR/ldap.js $CONFIGURATION -d 10 \$SERVER -U\$USERNAME%\$PASSWORD
 
 # Tests for RPC
 
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index ae97d502ee..c84f151043 100755
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -546,6 +546,7 @@ sub write_clientconf($$)
 	torture:basedir = $prefix_abs/client
 #We don't want to pass our self-tests if the PAC code is wrong
 	gensec:require_pac = true
+	modules dir = $prefix_abs/../bin/modules
 ";
 	close(CF);
 }
-- 
cgit