tests/scripts/test000-rootdse - diff

Return to test000-rootdse CVS log

Up to [OpenLDAP] / tests / scripts

Diff for /tests/scripts/test000-rootdse between versions 1.22 and 1.22.2.3

version 1.22, 2004/05/15 12:35:05	version 1.22.2.3, 2005/09/28 00:30:36
Line 1	Line 1
#! /bin/sh	#! /bin/sh
# $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.21 2004/04/28 18:10:22 kurt Exp $	# $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.26 2005/09/21 00:40:09 kurt Exp $
## This work is part of OpenLDAP Software <http://www.openldap.org/>.	## This work is part of OpenLDAP Software <http://www.openldap.org/>.
##	##
## Copyright 1998-2004 The OpenLDAP Foundation.	## Copyright 1998-2005 The OpenLDAP Foundation.
## All rights reserved.	## All rights reserved.
##	##
## Redistribution and use in source and binary forms, with or without	## Redistribution and use in source and binary forms, with or without
Line 16	Line 16
echo "running defines.sh"	echo "running defines.sh"
. $SRCDIR/scripts/defines.sh	. $SRCDIR/scripts/defines.sh

mkdir -p $TESTRUN $DBDIR1	mkdir -p $TESTDIR $DBDIR1

echo "Starting slapd on TCP/IP port $PORT1..."	echo "Starting slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1	. $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1
Line 49 if test $RC = 0 ; then	Line 49 if test $RC = 0 ; then

fi	fi

	count=2
if test $RC = 0 ; then	if test $RC = 0 ; then
if test $MONITORDB = yes -o $MONITORDB = mod ; then	case $MONITORDB in yes \| mod)
	count=3
echo "Using ldapsearch to retrieve the cn=Monitor..."	echo "Using ldapsearch to retrieve the cn=Monitor..."
$LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT1 \	$LDAPSEARCH -b "cn=Monitor" -s base -h $LOCALHOST -p $PORT1 \
'+extensibleObject' >> $SEARCHOUT 2>&1	'+extensibleObject' >> $SEARCHOUT 2>&1
RC=$?	RC=$?
fi	;;
	esac
fi	fi

test $KILLSERVERS != no && kill -HUP $KILLPIDS	test $KILLSERVERS != no && kill -HUP $KILLPIDS
Line 67 if test $RC != 0 ; then	Line 70 if test $RC != 0 ; then
echo ">>>>> Test failed"	echo ">>>>> Test failed"
else	else
RC=`grep '^dn:' $SEARCHOUT \| wc -l`	RC=`grep '^dn:' $SEARCHOUT \| wc -l`
if test $RC != 3 ; then	if test $RC != $count ; then
echo ">>>>> Test failed: expected 3 entries, got" $RC	echo ">>>>> Test failed: expected $count entries, got" $RC
RC=1	RC=1
else	else
echo ">>>>> Test succeeded"	echo ">>>>> Test succeeded"

Removed from v.1.22
changed lines
	Added in v.1.22.2.3