unifdef -DSLAPD_SCHEMA_NOT_COMPAT -USLAPD_SCHEMA_COMPAT

[openldap] / tests / scripts / test005-modrdn

diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index a6115be9f2da00b383e14d65991fd9f489a37b3e..ca5b98bea14b499620a5119bb6cc587e0278788e 100755 (executable)
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -1,4 +1,5 @@
 #! /bin/sh
+# $OpenLDAP$
 
 if test $# -eq 0 ; then
        SRCDIR="."
@@ -16,23 +17,23 @@ echo "Cleaning up in $DBDIR..."
 
 rm -f $DBDIR/[!C]*
 
-echo "Running ldif2ldbm to build slapd database..."
-$LDIF2LDBM -f $CONF -i $LDIF -e ../servers/slapd/tools
+echo "Running slapadd to build slapd database..."
+$LDIF2LDBM -f $CONF -l $LDIF
 RC=$?
 if test $RC != 0 ; then
-       echo "ldif2ldbm failed!"
+       echo "slapadd failed!"
        exit $RC
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d $LVL $TIMING > $MASTERLOG 2>&1 &
+$SLAPD -f $CONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!
 echo "Testing slapd modrdn operations..."
 
 # Make sure we can search the database
 for i in 0 1 2 3 4 5; do
-       $LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
-               'cn=Manager' > /dev/null 2>&1
+       $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+           'objectClass=*' > $INITOUT 2>&1
        RC=$?
        if test $RC = 1 ; then
                echo "Waiting 5 seconds for slapd to start..."
@@ -46,14 +47,11 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-cat /dev/null > $TESTOUT
-
-
 # -r used to do remove of old rdn
 
 echo "Testing modrdn(deleteoldrdn=0)..."
 $LDAPMODRDN -v -D "$MANAGERDN" -h localhost -p $PORT -w $PASSWD > \
-       /dev/null 2>&1 'cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US' 'cn=James A Jones III'
+       $TESTOUT 2>&1 'cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US' 'cn=James A Jones III'
 
 RC=$?
 if test $RC != 0 ; then
@@ -63,8 +61,8 @@ if test $RC != 0 ; then
 fi
 
 echo "Testing modrdn(deleteoldrdn=1)..."
-$LDAPMODRDN -v -D "$MANAGERDN" -r -h localhost -p $PORT -w $PASSWD > \
-       /dev/null 2>&1 'cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US' 'cn=James A Jones II'
+$LDAPMODRDN -v -D "$MANAGERDN" -r -h localhost -p $PORT -w $PASSWD >> \
+       $TESTOUT 2>&1 'cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US' 'cn=James A Jones II'
 
 RC=$?
 if test $RC != 0 ; then
@@ -76,9 +74,8 @@ fi
 # Ensure the new rdn's can be found
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones III)..."
-$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
-           'cn=James A Jones III' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-           > $SEARCHOUT 2>&1
+$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+           'cn=James A Jones III' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed!"
@@ -94,7 +91,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
        echo "comparison failed - modrdn operations did not complete correctly"
@@ -104,9 +101,8 @@ fi
 
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones II)..."
-$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
-           'cn=James A Jones II' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-           >  $SEARCHOUT 2>&1
+$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+           'cn=James A Jones II' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed!"
@@ -122,7 +118,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
        echo "comparison failed - modrdn operations did not complete correctly"
@@ -134,18 +130,23 @@ fi
 # an attribute.
 
 echo "Using ldapsearch to retrieve entries using removed rdn (cn=James A Jones 2)..."
-$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
-           'cn=James A Jones 2' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-           > /dev/null 2>&1
+$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+           'cn=James A Jones 2' > $SEARCHOUT 2>&1
 RC=$?
-if test $RC = 0 ; then
-       echo "failure: ldapsearch found attribute that was to be removed!"
+if test $RC != 0 ; then
        kill -HUP $PID
+       echo "ldapsearch failed!"
        exit $RC
 fi
+$CMP $SEARCHOUT /dev/null
+if test $? != 0 ; then
+       echo "failure: ldapsearch found attribute that was to be removed!"
+       kill -HUP $PID
+       exit 1
+fi
 
 echo "Using ldapsearch to retrieve all the entries..."
-$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
+$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
            'objectClass=*' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
@@ -161,7 +162,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 if test $? != 0 ; then
        echo "comparison failed - modrdn operations did not complete correctly"
@@ -185,9 +186,8 @@ fi
 # present
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones 1)..."
-$LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
-           'cn=James A Jones 1' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-           >  $SEARCHOUT 2>&1
+$LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
+           'cn=James A Jones 1' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed!"
@@ -203,7 +203,7 @@ echo "Filtering ldapsearch results..."
 echo "Filtering original ldif used to create database..."
 . $SRCDIR/scripts/acfilter.sh < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
-cmp $SEARCHFLT $LDIFFLT
+$CMP $SEARCHFLT $LDIFFLT
 
 kill -HUP $PID
 if test $? != 0 ; then