sync with head

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index e3948bf29cff8cede4508067cf01ef0694b102b5..0663ead213225fc3e3daa49413461ae5dacb423a 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -34,10 +34,10 @@ WITHTLS=${AC_WITHTLS-yes}
 ACI=${AC_ACI_ENABLED-acino}
 VALSORT=${AC_valsort-valsortno}
 
-DATADIR=./testdata
 PROGDIR=./progs
-TESTDIR=./testrun
-SCHEMADIR=./schema
+DATADIR=${USER_DATADIR-./testdata}
+TESTDIR=${USER_TESTDIR-./testrun}
+SCHEMADIR=${USER_SCHEMADIR-./schema}
 
 DBDIR1A=$TESTDIR/db.1.a
 DBDIR1B=$TESTDIR/db.1.b

diff --git a/tests/scripts/relay b/tests/scripts/relay
index a6ae27a4ff2c646084ee9f6852d7ce447d2163f7..b02c8e0b78d47a5e2ec7b80e4724396ac98ddf33 100755 (executable)
--- a/tests/scripts/relay
+++ b/tests/scripts/relay
@@ -26,6 +26,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index 61c0f8cca2b7b80bc46ed2d4c29332d0f501432d..cb928a1b6ddee30db048f6a6d56749b5f022ae67 100755 (executable)
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -28,6 +28,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to retrieve the root DSE..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index fb1fc469dc55f2cfa56788342c74d517a365a321..9236f28d3b1cd2caf8e7039df8ecf08306ea214e 100755 (executable)
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -37,6 +37,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index fe24cb2f17cce043a3ee5cbc27294f7236b04e42..1b7b1e67a154a509db796b366814632b9a41fcb4 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -28,6 +28,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index cbbc9ee7efd234e06903b94c2c2e50418c857696..8646f919e9e9ad8f29aebe4bb661daa6f7cc15dc 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -45,6 +45,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 53b237003e853fe0a725c31e11d97ec9c3d37dd6..649fde2c5afd0f13bb9debacd8504baa85b006c8 100755 (executable)
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -36,6 +36,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd modify operations..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index c8154149b05cd3ba2a0cbbae725e0870ec025612..d6c2e383dfc97583d5eaa99cefca11440b8ae7c9 100755 (executable)
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -36,6 +36,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd modrdn operations..."
 
 # Make sure we can search the database

diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index e93dbe9638bed6eb66ddd77703eb322accd84636..38da4d1bc0bae00fba1eea8ff07bbc5bb897ffe7 100755 (executable)
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -44,6 +44,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd access control..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 8146f8299ecc87ba91770f4b7595b59145d33f6f..ea006738b8617d916cf8b8bb082e0ddff1498c76 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -55,6 +55,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $SLAVEPID"
 
+sleep 1
+
 echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -252,6 +254,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $SLAVEPID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slave slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
@@ -277,9 +281,10 @@ KILLPIDS="$KILLPIDS $SLURPPID"
 echo "Waiting 15 seconds for slurpd to send changes..."
 sleep 15
 
-echo "Try updating the slave slapd..."
-$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD > \
-       $TESTOUT 2>&1 << EOMODS
+if test ! $BACKLDAP = "ldapno" ; then
+       echo "Try updating the slave slapd..."
+       $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD > \
+               $TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com
 changetype: modify
 add: description
@@ -288,18 +293,7 @@ description: unless the chain overlay is configured appropriately ;)
 
 EOMODS
 
-RC=$?
-
-if test $BACKLDAP = "ldapno" ; then
-       # expect 10 (LDAP_REFERRAL)...
-       if test $RC != 10 ; then
-               echo "ldapmodify should have failed ($RC)!"
-               test $KILLSERVERS != no && kill -HUP $KILLPIDS
-               exit $RC
-       fi
-
-else
-       # expect 0 (LDAP_SUCCESS)...
+       RC=$?
        if test $RC != 0 ; then
                echo "ldapmodify failed ($RC)!"
                test $KILLSERVERS != no && kill -HUP $KILLPIDS

diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index 3841c3345e79d9755dd0e8a95f76d4ec41b95abc..6ea541f0bffe6a7b0aa2299e540e9d75d9c138fb 100755 (executable)
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -36,6 +36,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -49,7 +51,8 @@ for i in 0 1 2 3 4 5; do
 done
 
 echo "Using tester for concurrent server access..."
-$SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50
+time $SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50
+#$SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50
 RC=$?
 
 if test $RC != 0 ; then

diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index 8fcd5b2ec6a750ddc1430496d927fd1b54e86cc9..24bcfc4246f88af886a4c0a1b4b533c58516ad4f 100755 (executable)
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -50,6 +50,8 @@ fi
 
 KILLPIDS="$PID $SLAVEPID"
 
+sleep 1
+
 echo "Testing for master slapd..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd
index f80e00cea007207fa181cfb5c1cc870536d27a35..463422ac5f035de7028026f53cb4a50c723d1de2 100755 (executable)
--- a/tests/scripts/test010-passwd
+++ b/tests/scripts/test010-passwd
@@ -28,6 +28,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test011-glue-slapadd b/tests/scripts/test011-glue-slapadd
index f54e0b5098cde1b83a3221b3863651ece333f74b..6e931613bcc9cfb00ee3c20482f201aa706adf75 100755 (executable)
--- a/tests/scripts/test011-glue-slapadd
+++ b/tests/scripts/test011-glue-slapadd
@@ -36,6 +36,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to retrieve all the entries..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1

diff --git a/tests/scripts/test012-glue-populate b/tests/scripts/test012-glue-populate
index c45feec9d6d5fbf575aab78e988fb6e014f487e3..8593351b3860378b820e5aeeb0d318b6c11c3ab0 100755 (executable)
--- a/tests/scripts/test012-glue-populate
+++ b/tests/scripts/test012-glue-populate
@@ -28,6 +28,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test013-language b/tests/scripts/test013-language
index a9cef2320b9ea5a90b8c7c70099889c7a290265e..767a7611cb17da9cffd2218f7afface9896ff2b1 100755 (executable)
--- a/tests/scripts/test013-language
+++ b/tests/scripts/test013-language
@@ -28,6 +28,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test014-whoami b/tests/scripts/test014-whoami
index 62734714ac5a38f9610a3a7bcc6192cca3548604..e0339031e2feb7df0ffc09169a620945f6d8a392 100755 (executable)
--- a/tests/scripts/test014-whoami
+++ b/tests/scripts/test014-whoami
@@ -37,6 +37,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch
index 0adb6ebbdd17ef398aa61acb213316488914a102..01592fb831b98521f91b53c2586e0bb7412f8ca1 100755 (executable)
--- a/tests/scripts/test015-xsearch
+++ b/tests/scripts/test015-xsearch
@@ -45,6 +45,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref
index c8326b8c2f43e69a828359f44ff333b385882af6..85e4a88a4aa37f59c55f25de485aedc6d543c17f 100755 (executable)
--- a/tests/scripts/test016-subref
+++ b/tests/scripts/test016-subref
@@ -38,6 +38,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh
index 3b01f1a0bfac9e284b94e656ddd7c2855de2cd55..eac4b5e8512c3be0abaa1fb63f26261957e3ae71 100755 (executable)
--- a/tests/scripts/test017-syncreplication-refresh
+++ b/tests/scripts/test017-syncreplication-refresh
@@ -43,6 +43,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -81,6 +83,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $SLAVEPID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slave slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \

diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index db2df02054b56cf13ce9ae1517f55a809840ca97..e7bb8f1512a0835aa708f7bee228a534ea76c088 100755 (executable)
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -48,6 +48,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -86,6 +88,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $SLAVEPID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slave slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT4 \
@@ -129,6 +133,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID $SLAVEPID"
 
+sleep 1
+
 echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -273,9 +279,10 @@ KILLPIDS="$PID $SLAVEPID"
 echo "Waiting 25 seconds for syncrepl to receive changes..."
 sleep 25
 
-echo "Try updating the slave slapd..."
-$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT4 -w $PASSWD > \
-       $TESTOUT 2>&1 << EOMODS
+if test ! $BACKLDAP = "ldapno" ; then
+       echo "Try updating the slave slapd..."
+       $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT4 -w $PASSWD > \
+               $TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com
 changetype: modify
 add: description
@@ -284,18 +291,7 @@ description: unless the chain overlay is configured appropriately ;)
 
 EOMODS
 
-RC=$?
-
-if test $BACKLDAP = "ldapno" ; then
-       # expect 10 (LDAP_REFERRAL)...
-       if test $RC != 10 ; then
-               echo "ldapmodify should have failed ($RC)!"
-               test $KILLSERVERS != no && kill -HUP $KILLPIDS
-               exit $RC
-       fi
-
-else
-       # expect 0 (LDAP_SUCCESS)...
+       RC=$?
        if test $RC != 0 ; then
                echo "ldapmodify failed ($RC)!"
                test $KILLSERVERS != no && kill -HUP $KILLPIDS

diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade
index 3a599a7e1e45adaef207d3484abcfd2008f3063c..ddba1ce0177abaa3339e1d2b0a4a451dff4c727e 100755 (executable)
--- a/tests/scripts/test019-syncreplication-cascade
+++ b/tests/scripts/test019-syncreplication-cascade
@@ -47,6 +47,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that master slapd (pid=$PID) is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -85,6 +87,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $SLAVEPID"
 
+sleep 1
+
 echo "Using ldapsearch to check that R1 slave slapd (pid=$SLAVEPID) is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
@@ -113,6 +117,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $SLAVEPID"
 
+sleep 1
+
 echo "Using ldapsearch to check that R2 slave slapd (pid=$SLAVEPID) is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \
@@ -141,6 +147,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $SLAVEPID"
 
+sleep 1
+
 echo "Using ldapsearch to check that P1 slave slapd (pid=$SLAVEPID) is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT4 \
@@ -169,6 +177,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $SLAVEPID"
 
+sleep 1
+
 echo "Using ldapsearch to check that P2 slave slapd (pid=$SLAVEPID) is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT5 \
@@ -197,6 +207,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $SLAVEPID"
 
+sleep 1
+
 echo "Using ldapsearch to check that P3 slave slapd (pid=$SLAVEPID) is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT6 \

diff --git a/tests/scripts/test020-proxycache b/tests/scripts/test020-proxycache
index b8c43401114bc6c08245d031ce4ff7364a5464e0..0fc9f8b719b8cdbabf5bedb2fbafe802b1853324 100755 (executable)
--- a/tests/scripts/test020-proxycache
+++ b/tests/scripts/test020-proxycache
@@ -54,6 +54,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -92,6 +94,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $CACHEPID"
 
+sleep 1
+
 echo "Using ldapsearch to check that proxy slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \

diff --git a/tests/scripts/test021-certificate b/tests/scripts/test021-certificate
index e9e5db579d3d30f420a2520ec35d5045640087c7..c1609c16aa9d593157f3cb2e70aa7c48abdec022 100755 (executable)
--- a/tests/scripts/test021-certificate
+++ b/tests/scripts/test021-certificate
@@ -34,6 +34,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
+#valgrind -v --gdb-attach=yes --logfile=info --num-callers=16 --leak-check=yes --leak-resolution=high $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING </dev/tty > $LOG1 2>&1 &
 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
@@ -44,6 +45,8 @@ KILLPIDS="$PID"
 
 echo "Testing certificate handling..."
 
+sleep 1
+
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
                'objectclass=*' > /dev/null 2>&1

diff --git a/tests/scripts/test022-ppolicy b/tests/scripts/test022-ppolicy
index 2b3a6143accaccd6ef0e95d09aa0ecce89883168..75682d6edd877013a9c3fe491c9d514c26659ab6 100755 (executable)
--- a/tests/scripts/test022-ppolicy
+++ b/tests/scripts/test022-ppolicy
@@ -36,6 +36,8 @@ KILLPIDS="$PID"
 USER="uid=nd, ou=People, dc=example, dc=com"
 PASS=testpassword
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint
index fb1687cff50121dbce1f334aeeb8bf00018943d7..0abd2d32c231b3677e607f763af416ad421c6f3d 100755 (executable)
--- a/tests/scripts/test023-refint
+++ b/tests/scripts/test023-refint
@@ -46,6 +46,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd referential integrity operations..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test024-unique b/tests/scripts/test024-unique
index 9f2db4aa8e4a607558ba61850b7a14bd0d839afc..d14d6222bb3408cb912b76e6fcfa9ff3f33db14b 100755 (executable)
--- a/tests/scripts/test024-unique
+++ b/tests/scripts/test024-unique
@@ -41,6 +41,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd attribute uniqueness operations..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits
index 78d92ea0c7a8f5b180fccbbacd34108bf0d67510..4280532389beb78196804286d574dca57d8b1317 100755 (executable)
--- a/tests/scripts/test025-limits
+++ b/tests/scripts/test025-limits
@@ -47,6 +47,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test026-dn b/tests/scripts/test026-dn
index 01417a0f96ece8888141dfa8fc5de973ae2b270d..1b5c9ac9674caae5a61c6f298ba2660fb9dcd9ef 100755 (executable)
--- a/tests/scripts/test026-dn
+++ b/tests/scripts/test026-dn
@@ -27,6 +27,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd DN parsing..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test027-emptydn b/tests/scripts/test027-emptydn
index efb922ae50725a184599c9bfd0060ae58c00a6de..aadbe855533f122aef43b72b9496b974296ebd33 100755 (executable)
--- a/tests/scripts/test027-emptydn
+++ b/tests/scripts/test027-emptydn
@@ -44,6 +44,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd empty DN handling..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -104,6 +106,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd empty DN handling..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test028-idassert b/tests/scripts/test028-idassert
index ea364bc8d4f9c9b2c76d8119f382bd32bf736aaf..716a3442ab4129653f8ce84774766f8d1c858dcd 100755 (executable)
--- a/tests/scripts/test028-idassert
+++ b/tests/scripts/test028-idassert
@@ -74,6 +74,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test029-ldapglue b/tests/scripts/test029-ldapglue
index 4701e1897e055e8a66a836b3a36171600c38ebb9..5d194c0d12779e681100ad1447f1e5aa06c86686 100755 (executable)
--- a/tests/scripts/test029-ldapglue
+++ b/tests/scripts/test029-ldapglue
@@ -97,6 +97,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID1 $PID2 $PID3"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test031-component-filter b/tests/scripts/test031-component-filter
index cda58d406a478d1124bb90362f6b00423f783e4c..69466f2043d2751e0e776f8e2d0097c1a4d992f6 100755 (executable)
--- a/tests/scripts/test031-component-filter
+++ b/tests/scripts/test031-component-filter
@@ -60,6 +60,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test032-chain b/tests/scripts/test032-chain
index b0c6435d79297eaeea06add59d85edc75c424df8..5b6a1db01b16fb8323bc5f838abc015b82686862 100755 (executable)
--- a/tests/scripts/test032-chain
+++ b/tests/scripts/test032-chain
@@ -62,6 +62,8 @@ fi
 
 KILLPIDS="$PID1 $PID2"
 
+sleep 1
+
 echo "Using ldapsearch to check that first slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test033-glue-syncrepl b/tests/scripts/test033-glue-syncrepl
index 1ffb611d6bf4c894d2d90e6de3f5d01f0d505024..57d50b847710e0d3fc80d5cac9b8962096081875 100755 (executable)
--- a/tests/scripts/test033-glue-syncrepl
+++ b/tests/scripts/test033-glue-syncrepl
@@ -40,6 +40,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd 1 is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -62,6 +64,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd 2 is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \

diff --git a/tests/scripts/test034-translucent b/tests/scripts/test034-translucent
index b42f104133f65cb646a3c7b29985389c89158255..e30ba63dde7607d679d04b177e5a439a3c56845f 100755 (executable)
--- a/tests/scripts/test034-translucent
+++ b/tests/scripts/test034-translucent
@@ -57,6 +57,8 @@ fi
 REMOTEPID="$PID"
 KILLPIDS="$PID"
 
+sleep 1
+
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -H $URI1 \
                'objectclass=*' > /dev/null 2>&1
@@ -89,6 +91,8 @@ fi
 LOCALPID="$PID"
 KILLPIDS="$LOCALPID $REMOTEPID"
 
+sleep 1
+
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -H $URI2 \
                'objectclass=*' > /dev/null 2>&1
@@ -215,6 +219,8 @@ fi
 LOCALPID="$PID"
 KILLPIDS="$REMOTEPID $PID"
 
+sleep 1
+
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -H $URI2 \
                'objectclass=*' > /dev/null 2>&1
@@ -635,6 +641,8 @@ fi
 LOCALPID="$PID"
 KILLPIDS="$REMOTEPID $PID"
 
+sleep 1
+
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -H $URI2 \
                'objectclass=*' > /dev/null 2>&1

diff --git a/tests/scripts/test035-meta b/tests/scripts/test035-meta
index d9164f1279c40b328daf1cf6a272519ca957f00e..c88b19de5b0a1ab4e6c5106ceecd1d21bc488d20 100755 (executable)
--- a/tests/scripts/test035-meta
+++ b/tests/scripts/test035-meta
@@ -37,6 +37,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -74,6 +76,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
@@ -111,6 +115,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \

diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency
index c1d81cddfd0042ebcec9b128720d7076bc04e34a..1aeaa205a3eaa95b04a9998b27b84f8697f22d71 100755 (executable)
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@@ -65,6 +65,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -102,6 +104,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
@@ -139,6 +143,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \

diff --git a/tests/scripts/test037-manage b/tests/scripts/test037-manage
index f28ec6ff0f21e316e2007ed4deb8bea7ce322a02..e6823425a8ce09a9aca6bcbb387b906d0a89af1d 100755 (executable)
--- a/tests/scripts/test037-manage
+++ b/tests/scripts/test037-manage
@@ -36,6 +36,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd Manage operations..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test038-retcode b/tests/scripts/test038-retcode
index 9a626383abe310936e21e9ea3401fd0a1b014d17..3437b7efc914c764a587791f8c3edfa545d57d09 100755 (executable)
--- a/tests/scripts/test038-retcode
+++ b/tests/scripts/test038-retcode
@@ -50,6 +50,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test039-glue-ldap-concurrency b/tests/scripts/test039-glue-ldap-concurrency
index 87cabe33d89e706ac73abc9d05999c376124d83e..2617e780c9a24e3780934afe930dfdefca23fbb5 100755 (executable)
--- a/tests/scripts/test039-glue-ldap-concurrency
+++ b/tests/scripts/test039-glue-ldap-concurrency
@@ -42,6 +42,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -79,6 +81,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
@@ -116,6 +120,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $PID"
 
+sleep 1
+
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \

diff --git a/tests/scripts/test040-subtree-rename b/tests/scripts/test040-subtree-rename
index f212a5c03d452a14af906b8f1727109dc1909ec0..62ece0de90b08189fb1bd44c7a6d6f7877f68a6a 100755 (executable)
--- a/tests/scripts/test040-subtree-rename
+++ b/tests/scripts/test040-subtree-rename
@@ -36,6 +36,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd searching..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test041-aci b/tests/scripts/test041-aci
index 54bb1c0f7b698e1317cdcc96fb166d583f7e80fd..0ba871e78c4c5946cff4e347ad2836154fedd3fa 100755 (executable)
--- a/tests/scripts/test041-aci
+++ b/tests/scripts/test041-aci
@@ -13,9 +13,6 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-echo "Test disabled."
-exit 0
-
 case "$BACKEND" in
 bdb|hdb|ldbm)
        ;;
@@ -53,6 +50,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd ACI access control..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort
index fd86e31b352521e73d8930d941604ef34387700b..b8a332f7536a8328a5603a13711f32ef687a254a 100755 (executable)
--- a/tests/scripts/test042-valsort
+++ b/tests/scripts/test042-valsort
@@ -41,6 +41,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd sorted values operations..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \