More streamlining.

[openldap] / tests / scripts / test012-glue

diff --git a/tests/scripts/test012-glue b/tests/scripts/test012-glue
index 890877367481effec3463548868ddb6316cec8e9..a8b93f06985effbd73364fda4e795697ff1a3738 100755 (executable)
--- a/tests/scripts/test012-glue
+++ b/tests/scripts/test012-glue
@@ -5,10 +5,14 @@ SRCDIR="."
 if test $# -ge 1 ; then
        SRCDIR=$1; shift
 fi
-BACKEND=ldbm
+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
@@ -24,7 +28,7 @@ mkdir $DBDIR/C_db1 $DBDIR/C_db2 $DBDIR/C_db3
 rm -f $DBDIR/[!C]* $DBDIR/C_db?/*
 
 echo "Running slapadd to build glued slapd databases..."
-. $CONFFILTER $BACKEND < $GLUECONF > $DBCONF
+. $CONFFILTER $BACKEND $MONITORDB < $GLUECONF > $DBCONF
 $SLAPADD -d $LVL -f $DBCONF -l $LDIFORDERED > $DBDIR/slapadd.log 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -43,16 +47,19 @@ fi
 echo "Using ldapsearch to retrieve all the entries..."
 cd test-db
 for i in 0 1 2 3 4 5; do
-       ../$LDAPSEARCH -b "$BASEDN" -h localhost:$PORT > ../$SEARCHOUT 2>&1
+       ../$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT > ../$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
 cd ..
 
 kill -HUP $PID
+echo "Sleeping for 5 seconds to let slapd exit..."
+sleep 5
 
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
@@ -69,7 +76,7 @@ $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 if test $? != 0 ; then
        echo "comparison failed - database was not created correctly"
        echo $SEARCHFLT $LDIFFLT
-       diff -iu $SEARCHFLT $LDIFFLT
+       $DIFF $SEARCHFLT $LDIFFLT
        exit 1
 fi
 
@@ -87,17 +94,18 @@ fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
-       $LDAPSEARCH -s base -b "$MONITOR" -h localhost -p $PORT \
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \
                'objectclass=*' > /dev/null 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
 
 echo "Using ldapadd to populate the glued database..."
-$LDAPADD -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD < \
+$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \
        $LDIFORDERED > $TESTOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -107,8 +115,9 @@ if test $RC != 0 ; then
 fi
 
 echo "Using ldapsearch to read all the entries..."
-$LDAPSEARCH -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -b "$BASEDN" -h $LOCALHOST -p $PORT \
        'objectclass=*' > $SEARCHOUT 2>&1
+RC=$?
 
 kill -HUP $PID