More streamlining.

[openldap] / tests / scripts / test002-populate

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 7852062ba11310a472d26064dc2977f0d8224822..5f4ba5a436781cf19b6e3dac0e01b88fe0a06c9c 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -1,65 +1,81 @@
-#!/bin/sh
+#! /bin/sh
+# $OpenLDAP$
 
-if [ $# -eq 0 ]; then
-       SRCDIR="."
-else
+SRCDIR="."
+if test $# -ge 1 ; then
        SRCDIR=$1; shift
 fi
-if [ $# -eq 1 ]; then
-       BDB2=$1; shift
+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/defines.sh $SRCDIR $BDB2
+echo "running defines.sh"
+. $SRCDIR/scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
 
 rm -f $DBDIR/[!C]*
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d $LVL $TIMING > $MASTERLOG 2>&1 &
+. $CONFFILTER $BACKEND $MONITORDB < $CONF > $DBCONF
+$SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
+if test $WAIT != 0 ; then
+    echo PID $PID
+    read foo
+fi
 
 echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do
-       $LDAPSEARCH -L -b "$BASEDN" -h localhost -p $PORT \
-               'cn=Monitor' > /dev/null 2>&1
+       $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \
+               'objectclass=*' > /dev/null 2>&1
        RC=$?
-       if [ $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 ldapmodify to populate the database..."
-$LDAPMODIFY -a -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD < \
-       $LDIFORDERED > /dev/null 2>&1
+echo "Using ldapadd to populate the database..."
+$LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \
+       $LDIFORDERED > $TESTOUT 2>&1
 RC=$?
-if [ $RC != 0 ]; then
-       echo "ldapmodify failed!"
+if test $RC != 0 ; then
+       echo "ldapadd failed ($RC)!"
        kill -HUP $PID
        exit $RC
 fi
 
 echo "Using ldapsearch to read all the entries..."
-$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
-       'objectclass=*' | egrep -iv '^creatorsname:|^createtimestamp:' > \
-       $SEARCHOUT 2>&1
+$LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \
+       'objectclass=*' > $SEARCHOUT 2>&1
+RC=$?
 
 kill -HUP $PID
 
-if [ $RC != 0 ]; then
-       echo "ldapsearch failed!"
+if test $RC != 0 ; then
+       echo "ldapsearch failed ($RC)!"
        exit $RC
 fi
 
 echo "Filtering ldapsearch results..."
-. $SRCDIR/scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
+. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
 echo "Filtering original ldif used to create database..."
-. $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
+. $LDIFFILTER < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
-if [ $? != 0 ]; then
+if test $? != 0 ; then
        echo "comparison failed - database was not created correctly"
        exit 1
 fi