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.2.7 and 1.23

version 1.22.2.7, 2008/02/11 23:24:28	version 1.23, 2005/01/01 19:50:02
Line 1	Line 1
#! /bin/sh	#! /bin/sh
# $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.22.2.6 2007/01/02 21:44:13 kurt Exp $	# $OpenLDAP: pkg/ldap/tests/scripts/test000-rootdse,v 1.22 2004/05/15 12:35:05 ando 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-2008 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 $TESTDIR $DBDIR1	mkdir -p $TESTRUN $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 28 if test $WAIT != 0 ; then	Line 28 if test $WAIT != 0 ; then
fi	fi
KILLPIDS="$PID"	KILLPIDS="$PID"

sleep 1

echo "Using ldapsearch to retrieve the root DSE..."	echo "Using ldapsearch to retrieve the root DSE..."
for i in 0 1 2 3 4 5; do	for i in 0 1 2 3 4 5; do
$LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT1 \	$LDAPSEARCH -b "" -s base -h $LOCALHOST -p $PORT1 \
Line 51 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
case $MONITORDB in yes \| mod)	if test $MONITORDB = yes -o $MONITORDB = mod ; then
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 72 if test $RC != 0 ; then	Line 67 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 != $count ; then	if test $RC != 3 ; then
echo ">>>>> Test failed: expected $count entries, got" $RC	echo ">>>>> Test failed: expected 3 entries, got" $RC
RC=1	RC=1
else	else
echo ">>>>> Test succeeded"	echo ">>>>> Test succeeded"

Removed from v.1.22.2.7
changed lines
	Added in v.1.23