Sync with HEAD

[openldap] / tests / scripts / test000-rootdse

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index 15c0710653fbdd3833a18f688738f309b4f7fc7b..635b9fff6b8e80d23d4081312a62c600049422af 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-2006 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 \
@@ -79,4 +81,6 @@ else
        fi
 fi
 
+test $KILLSERVERS != no && wait
+
 exit $RC