X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest001-slapadd;h=a93b1d8f55e9b9da69ca6e2983d3cb2c875eadb7;hb=fffc29df9becf3ccdb7245150d7e222f0c227c43;hp=6ab1a5c52b7034a8c5be920560baa1caa772d995;hpb=80400aba5252d7b2db0b74df0bd259ba1e25bbb2;p=openldap

diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 6ab1a5c52b..a93b1d8f55 100755
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -1,17 +1,17 @@
-#!/bin/sh
+#! /bin/sh
 
-if [ $# -eq 0 ]; then
+if test $# -eq 0 ; then
 	SRCDIR="."
 else
 	SRCDIR=$1; shift
 fi
-if [ $# -eq 1 ]; then
-	BDB2=$1; shift
+if test $# -eq 1 ; then
+	BACKEND=$1; shift
 fi
 
-echo "running defines.sh $SRCDIR $BDB2"
+echo "running defines.sh $SRCDIR $BACKEND"
 
-. $SRCDIR/scripts/defines.sh $SRCDIR $BDB2
+. $SRCDIR/scripts/defines.sh
 
 echo "Datadir is $DATADIR"
 
@@ -22,7 +22,7 @@ rm -f $DBDIR/[!C]*
 echo "Running ldif2ldbm to build slapd database..."
 $LDIF2LDBM -f $CONF -i $LDIF -e ../servers/slapd/tools
 RC=$?
-if [ $RC != 0 ]; then
+if test $RC != 0 ; then
 	echo "ldif2ldbm failed!"
 	exit $RC
 fi
@@ -36,7 +36,7 @@ for i in 0 1 2 3 4 5; do
 	$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
 		'objectClass=*' > $SEARCHOUT 2>&1
 	RC=$?
-	if [ $RC = 1 ]; then
+	if test $RC = 1 ; then
 		echo "Waiting 5 seconds for slapd to start..."
 		sleep 5
 	fi
@@ -44,14 +44,19 @@ done
 
 kill -HUP $PID
 
-if [ $RC != 0 ]; then
+if test $RC != 0 ; then
 	echo "ldapsearch failed!"
 	exit $RC
 fi
 
-echo "Comparing retrieved entries to LDIF file used to create database"
-cmp $SEARCHOUT $LDIF
-if [ $? != 0 ]; then
+echo "Filtering ldapsearch results..."
+. $SRCDIR/scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
+echo "Filtering original ldif used to create database..."
+. $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
+echo "Comparing filter output..."
+cmp $SEARCHFLT $LDIFFLT
+
+if test $? != 0 ; then
 	echo "comparison failed - database was not created correctly"
 	exit 1
 fi