This test uses syncrepl persist, but ldbm doesn't support that. Exclude it.

[openldap] / tests / scripts / test023-refint

diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint
index 2b1337b53fca46a57dba905793cfb2c442d64626..0abd2d32c231b3677e607f763af416ad421c6f3d 100755 (executable)
--- a/tests/scripts/test023-refint
+++ b/tests/scripts/test023-refint
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2004 The OpenLDAP Foundation.
+## Copyright 2004-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-if test "$BACKEND" != "bdb" -a "$BACKEND" != "hdb" ; then
+if test "$BACKEND" != "bdb" && test "$BACKEND" != "hdb" ; then
        echo "Test does not support $BACKEND"
        exit 0
 fi
@@ -46,6 +46,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
+sleep 1
+
 echo "Testing slapd referential integrity operations..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -66,10 +68,7 @@ fi
 
 echo "Searching unmodified database..."
 
-$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-       egrep "(manager|secretary):" | sed "s/george/foster/g" | \
-       sort > $SEARCHOUT 2>&1
-
+$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
@@ -77,6 +76,9 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
+$EGREP_CMD "(manager|secretary):" $SEARCHOUT | sed "s/george/foster/g" | \
+       sort > $TESTOUT 2>&1
+
 echo "Testing modrdn..."
 $LDAPMODRDN -D "$REFINTDN" -r -h $LOCALHOST -p $PORT1 -w $PASSWD > \
        /dev/null 2>&1 'uid=george,ou=users,o=refint' 'uid=foster'
@@ -92,8 +94,7 @@ fi
 
 echo "Using ldapsearch to check dependents new rdn..."
 
-$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-       egrep "(manager|secretary):" | sort > $SEARCHFLT 2>&1
+$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
 
 RC=$?
        if test $RC != 0 ; then
@@ -102,11 +103,14 @@ RC=$?
        exit $RC
 fi
 
+$EGREP_CMD "(manager|secretary):" $SEARCHOUT | sort > $SEARCHFLT 2>&1
+
 echo "Comparing ldapsearch results against original..."
-$CMP $SEARCHOUT $SEARCHOUT > $CMPOUT
+$CMP $TESTOUT $SEARCHFLT > $CMPOUT
 
 if test $? != 0 ; then
        echo "comparison failed - modify operations did not complete correctly"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit 1
 fi
 
@@ -126,8 +130,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Using ldapsearch to verify dependents have been deleted..."
-$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 | \
-       egrep "(manager|secretary):" > $SEARCHFLT 2>&1
+$LDAPSEARCH -S "" -b "o=refint" -h $LOCALHOST -p $PORT1 > $SEARCHOUT 2>&1
 
 RC=$?
 if test $RC != 0 ; then
@@ -136,9 +139,12 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
+$EGREP_CMD "(manager|secretary):" $SEARCHOUT > $SEARCHFLT 2>&1
+
 RC=`grep -c foster $SEARCHFLT`
 if test $RC != 0 ; then
        echo "dependent modify failed - dependents were not deleted"
+       test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit 1
 fi
 
@@ -176,10 +182,6 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-
-
-#####
-
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 echo ">>>>> Test succeeded"