Fix prev commit, better test for multiple URI matches

[openldap] / tests / scripts / test000-rootdse

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index e61bc01eaf6a9e9c9313b6113dcfc173d5320bb7..635b9fff6b8e80d23d4081312a62c600049422af 100755 (executable)
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -1,45 +1,39 @@
 #! /bin/sh
 # $OpenLDAP$
-
-SRCDIR="."
-if test $# -ge 1 ; then
-       SRCDIR=$1; shift
-fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-       BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-       MONITORDB=$1; shift
-fi
-
-WAIT=0
-if test $# -ge 1 ; then
-       WAIT=1; shift
-fi
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2006 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-echo "Datadir is $DATADIR"
-
-echo "Cleaning up in $DBDIR..."
+mkdir -p $TESTDIR $DBDIR1
 
-rm -f $DBDIR/[!C]*
-
-echo "Starting slapd on TCP/IP port $PORT..."
-. $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $DBCONF
-$SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
+echo "Starting slapd on TCP/IP port $PORT1..."
+. $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1
+$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
     read foo
 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 $PORT '+extensibleObject' > $SEARCHOUT 2>&1
+       $LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT1 \
+               '+extensibleObject' > $SEARCHOUT 2>&1
        RC=$?
        if test $RC = 0 ; then
                break
@@ -48,25 +42,45 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 
-if test $RC = 0 -a $MONITORDB = yes ; then
-       echo "Using ldapsearch to retrieve the cn=Monitor..."
-       $LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT '+extensibleObject' >> $SEARCHOUT 2>&1
+if test $RC = 0 ; then
+       echo "Using ldapsearch to retrieve the cn=Subschema..."
+       $LDAPSEARCH -b "cn=Subschema" -s base -h $LOCALHOST -p $PORT1 \
+               '(&(objectClasses=top)(objectClasses=2.5.6.0))' cn objectClass \
+               >> $SEARCHOUT  2>&1
        RC=$?
+
 fi
 
-kill -HUP $PID
+count=2
+if test $RC = 0 ; 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
+               RC=$?
+               ;;
+       esac
+fi
+
+test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 cat $SEARCHOUT
 
+
 if test $RC != 0 ; then
        echo ">>>>> Test failed"
 else
-       if grep "TLS:" $SEARCHOUT; then
-               RC=-1
+       RC=`grep '^dn:' $SEARCHOUT | wc -l`
+       if test $RC != $count ; then
+               echo ">>>>> Test failed: expected $count entries, got" $RC
+               RC=1
        else
-           echo ">>>>> Test succeeded"
+               echo ">>>>> Test succeeded"
+               RC=0
        fi
 fi
 
+test $KILLSERVERS != no && wait
 
 exit $RC