Diff for /tests/scripts/test008-concurrency between versions 1.27.2.6 and 1.28

version 1.27.2.6, 2005/01/20 17:01:21 version 1.28, 2003/06/04 10:06:46
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
 # $OpenLDAP: pkg/ldap/tests/scripts/test008-concurrency,v 1.27.2.5 2004/01/01 18:16:43 kurt Exp $  # $OpenLDAP: pkg/ldap/tests/scripts/test008-concurrency,v 1.27 2003/04/30 01:04:18 hyc Exp $
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.  
 ##  SRCDIR="."
 ## Copyright 1998-2005 The OpenLDAP Foundation.  if test $# -ge 1 ; then
 ## All rights reserved.          SRCDIR=$1; shift
 ##  fi
 ## Redistribution and use in source and binary forms, with or without  
 ## modification, are permitted only as authorized by the OpenLDAP  . $SRCDIR/scripts/args.sh $*
 ## Public License.  
 ##  
 ## A copy of this license is available in the file LICENSE in the  
 ## top-level directory of the distribution or, alternatively, at  
 ## <http://www.OpenLDAP.org/license.html>.  
   
 echo "running defines.sh"  echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh  . $SRCDIR/scripts/defines.sh
   
 mkdir -p $TESTDIR $DBDIR1  echo "Datadir is $DATADIR"
   
   echo "Cleaning up in $DBDIR..."
   
   rm -f $DBDIR/[!C]*
   
 echo "Running slapadd to build slapd database..."  echo "Running slapadd to build slapd database..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1  . $CONFFILTER $BACKEND $MONITORDB < $CONF > $DBCONF
 $SLAPADD -f $CONF1 -l $LDIFORDERED  $SLAPADD -f $DBCONF -l $LDIFORDERED
 RC=$?  RC=$?
 if test $RC != 0 ; then  if test $RC != 0 ; then
         echo "slapadd failed ($RC)!"          echo "slapadd failed ($RC)!"
Line 30  fi Line 29  fi
 echo "Waiting 5 seconds for slapadd to build slapd database..."  echo "Waiting 5 seconds for slapadd to build slapd database..."
 sleep 5  sleep 5
   
 echo "Starting slapd on TCP/IP port $PORT1..."  echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &  $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &
 PID=$!  PID=$!
 if test $WAIT != 0 ; then  if test $WAIT != 0 ; then
     echo PID $PID      echo PID $PID
     read foo      read foo
 fi  fi
 KILLPIDS="$PID"  
   
 echo "Using ldapsearch to check that slapd is running..."  echo "Using ldapsearch to check that slapd is running..."
 for i in 0 1 2 3 4 5; do  for i in 0 1 2 3 4 5; do
         $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \          $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \
                 'objectclass=*' > /dev/null 2>&1                  'objectclass=*' > /dev/null 2>&1
         RC=$?          RC=$?
         if test $RC = 0 ; then          if test $RC = 0 ; then
Line 52  for i in 0 1 2 3 4 5; do Line 50  for i in 0 1 2 3 4 5; do
 done  done
   
 echo "Using tester for concurrent server access..."  echo "Using tester for concurrent server access..."
 $SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50  $SLAPDTESTER -b "$BASEDN" -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT -D "$MANAGERDN" -w $PASSWD -l 50
 RC=$?  RC=$?
   
 if test $RC != 0 ; then  if test $RC != 0 ; then
         echo "slapd-tester failed ($RC)!"          echo "slapd-tester failed ($RC)!"
         test $KILLSERVERS != no && kill -HUP $KILLPIDS  
         exit $RC          exit $RC
 fi   fi 
   
 echo "Using ldapsearch to retrieve all the entries..."  echo "Using ldapsearch to retrieve all the entries..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \  $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT \
                         'objectClass=*' > $SEARCHOUT 2>&1                          'objectClass=*' > $SEARCHOUT 2>&1
 RC=$?  RC=$?
   
 test $KILLSERVERS != no && kill -HUP $KILLPIDS  kill -HUP $PID
   
 if test $RC != 0 ; then  if test $RC != 0 ; then
         echo "ldapsearch failed ($RC)!"          echo "ldapsearch failed ($RC)!"
Line 86  if test $? != 0 ; then Line 83  if test $? != 0 ; then
 fi  fi
   
 echo ">>>>> Test succeeded"  echo ">>>>> Test succeeded"
   
   
 exit 0  exit 0

Removed from v.1.27.2.6  
changed lines
  Added in v.1.28


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org