make sure back-ldap is available; only load required modules (ITS#5355)

diff --git a/tests/data/slapd-meta.conf b/tests/data/slapd-meta.conf
index 117dd36dd700475c08ffee405cfead6ca9349f14..9a9e32757e74fb4396e2aa3a50dd92e159ce70bd 100644 (file)
--- 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 5927d93fcb2b52412b9ca4bf776d38359ed43d29..bed89b52eb71beb0ed9ec24e3d17233be8e12cd7 100755 (executable)
--- 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 371ba41c06118c1d1693aa9f7011340e289b8ea2..a42c99d35ed2e32173a78672c3f68360a858d787 100755 (executable)
--- 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