Merge remote branch 'origin/mdb.master'

[openldap] / tests / scripts / test000-rootdse

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index 1d6b9aab28b05d92a5b9f2aba3d3c8d2973c0c5f..22bc2a993d9359c51f44f666c3cff929d4ed461b 100755 (executable)
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -16,7 +16,7 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-mkdir -p $TESTRUN $DBDIR1
+mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1
@@ -28,10 +28,12 @@ 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 \
-               '+extensibleObject' > $SEARCHOUT 2>&1
+               '@extensibleObject' > $SEARCHOUT 2>&1
        RC=$?
        if test $RC = 0 ; then
                break
@@ -49,13 +51,16 @@ if test $RC = 0 ; then
 
 fi
 
+count=2
 if test $RC = 0 ; then
-       if test $MONITORDB = yes -o $MONITORDB = mod ; then
+       case $MONITORDB in yes | mod)
+               count=3
                echo "Using ldapsearch to retrieve the cn=Monitor..."
                $LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT1 \
-                       '+extensibleObject' >> $SEARCHOUT 2>&1
+                       '@monitor' >> $SEARCHOUT 2>&1
                RC=$?
-       fi
+               ;;
+       esac
 fi
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
@@ -67,8 +72,8 @@ if test $RC != 0 ; then
        echo ">>>>> Test failed"
 else
        RC=`grep '^dn:' $SEARCHOUT | wc -l`
-       if test $RC != 3 ; then
-               echo ">>>>> Test failed: expected 3 entries, got" $RC
+       if test $RC != $count ; then
+               echo ">>>>> Test failed: expected $count entries, got" $RC
                RC=1
        else
                echo ">>>>> Test succeeded"
@@ -76,4 +81,6 @@ else
        fi
 fi
 
+test $KILLSERVERS != no && wait
+
 exit $RC