Diff for /tests/scripts/test008-concurrency between versions 1.27.2.2 and 1.27.2.3

version 1.27.2.2, 2003/10/06 14:57:32 version 1.27.2.3, 2003/11/30 22:20:30
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
 # $OpenLDAP: pkg/ldap/tests/scripts/test008-concurrency,v 1.27.2.1 2003/09/18 15:43:41 kurt Exp $  # $OpenLDAP: pkg/ldap/tests/scripts/test008-concurrency,v 1.31 2003/10/22 03:14:09 kurt Exp $
   
 SRCDIR="."  
 if test $# -ge 1 ; then  
         SRCDIR=$1; shift  
 fi  
   
 . $SRCDIR/scripts/args.sh $*  
   
 echo "running defines.sh"  echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh  . $SRCDIR/scripts/defines.sh
   
 echo "Datadir is $DATADIR"  mkdir -p $TESTDIR $DBDIR1
   
 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 > $DBCONF  . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
 $SLAPADD -f $DBCONF -l $LDIFORDERED  $SLAPADD -f $CONF1 -l $LDIFORDERED
 RC=$?  RC=$?
 if test $RC != 0 ; then  if test $RC != 0 ; then
         echo "slapadd failed ($RC)!"          echo "slapadd failed ($RC)!"
Line 29  fi Line 18  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 $PORT..."  echo "Starting slapd on TCP/IP port $PORT1..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &  $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 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 $PORT \          $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
                 'objectclass=*' > /dev/null 2>&1                  'objectclass=*' > /dev/null 2>&1
         RC=$?          RC=$?
         if test $RC = 0 ; then          if test $RC = 0 ; then
Line 50  for i in 0 1 2 3 4 5; do Line 40  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 $PORT -D "$MANAGERDN" -w $PASSWD -l 50  $SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -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 $PORT \  $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
                         'objectClass=*' > $SEARCHOUT 2>&1                          'objectClass=*' > $SEARCHOUT 2>&1
 RC=$?  RC=$?
   
 kill -HUP $PID  test $KILLSERVERS != no && kill -HUP $KILLPIDS
   
 if test $RC != 0 ; then  if test $RC != 0 ; then
         echo "ldapsearch failed ($RC)!"          echo "ldapsearch failed ($RC)!"
Line 83  if test $? != 0 ; then Line 74  if test $? != 0 ; then
 fi  fi
   
 echo ">>>>> Test succeeded"  echo ">>>>> Test succeeded"
   
   
 exit 0  exit 0

Removed from v.1.27.2.2  
changed lines
  Added in v.1.27.2.3


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