--- tests/scripts/test000-rootdse	2004/05/15 12:35:05	1.22
+++ tests/scripts/test000-rootdse	2005/10/05 17:41:31	1.22.2.4
@@ -1,8 +1,8 @@
 #! /bin/sh
-# $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.21 2004/04/28 18:10:22 kurt Exp $
+# $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.27 2005/09/30 05:32:49 hyc Exp $
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2004 The OpenLDAP Foundation.
+## Copyright 1998-2005 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,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 \
@@ -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
 		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"