From 790c4d839920729b56d756ddd05a517914198252 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 30 Jun 2008 10:18:37 +0000
Subject: [PATCH] make sure back-ldap is available; only load required modules
 (ITS#5355)

---
 tests/data/slapd-meta.conf             | 8 ++------
 tests/scripts/test035-meta             | 5 +++++
 tests/scripts/test036-meta-concurrency | 5 +++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/tests/data/slapd-meta.conf b/tests/data/slapd-meta.conf
index 117dd36dd7..9a9e32757e 100644
--- a/tests/data/slapd-meta.conf
+++ b/tests/data/slapd-meta.conf
@@ -22,18 +22,12 @@ include		@SCHEMADIR@/ppolicy.schema
 pidfile		@TESTDIR@/slapd.m.pid
 argsfile	@TESTDIR@/slapd.m.args
 
-#mod#modulepath	../servers/slapd/back-@BACKEND@/
-#mod#moduleload	back_@BACKEND@.la
-#relaymod#modulepath ../servers/slapd/back-relay/
-#relaymod#moduleload back_relay.la
 #ldapmod#modulepath ../servers/slapd/back-ldap/
 #ldapmod#moduleload back_ldap.la
 #metamod#modulepath ../servers/slapd/back-meta/
 #metamod#moduleload back_meta.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
-#rwmmod#modulepath ../servers/slapd/overlays/
-#rwmmod#moduleload rwm.la
 
 # seems to improve behavior under very heavy load
 # (i.e. it alleviates load on target systems)
@@ -53,6 +47,8 @@ nretries	100
 # 1 sec timeout for binds
 bind-timeout	1000000
 
+idle-timeout	10
+
 # local
 uri		"@URI2@ou=Meta,o=Example,c=US"
 suffixmassage	"ou=Meta,o=Example,c=US" "ou=Meta,dc=example,dc=com"
diff --git a/tests/scripts/test035-meta b/tests/scripts/test035-meta
index 5927d93fcb..bed89b52eb 100755
--- a/tests/scripts/test035-meta
+++ b/tests/scripts/test035-meta
@@ -23,6 +23,11 @@ if test $BACKMETA = metano ; then
 	exit 0
 fi
 
+if test $BACKLDAP = ldapno ; then 
+	echo "ldap backend not available, test skipped"
+	exit 0
+fi
+
 rm -rf $TESTDIR
 
 mkdir -p $TESTDIR $DBDIR1 $DBDIR2
diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency
index 371ba41c06..a42c99d35e 100755
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@@ -23,6 +23,11 @@ if test $BACKMETA = metano ; then
 	exit 0
 fi
 
+if test $BACKLDAP = ldapno ; then 
+	echo "ldap backend not available, test skipped"
+	exit 0
+fi
+
 if test x$TESTLOOPS = x ; then
 	TESTLOOPS=50
 fi
-- 
2.39.5