ITS#2401 support tests for dynamically loaded backends

[openldap] / tests / scripts / test000-rootdse

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index b407afb3099beb9b40536d5b2227548c87c328aa..0723ca7d2c7761d677b42d366d0c4d68aa476ad6 100755 (executable)
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -5,19 +5,8 @@ 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
+. $SRCDIR/scripts/args.sh
 
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
@@ -39,17 +28,18 @@ fi
 
 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 $PORT '+extensibleObject' > $SEARCHOUT 2>&1
        RC=$?
-       if test $RC = 1 ; then
-               echo "Waiting 5 seconds for slapd to start..."
-               sleep 5
+       if test $RC = 0 ; then
+               break
        fi
+       echo "Waiting 5 seconds for slapd to start..."
+       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
+       $LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT '+extensibleObject' >> $SEARCHOUT 2>&1
        RC=$?
 fi