Diff for /tests/scripts/test008-concurrency between versions 1.34 and 1.34.2.4

version 1.34, 2004/08/27 15:07:18 version 1.34.2.4, 2005/10/05 17:41:32
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
 # $OpenLDAP: pkg/ldap/tests/scripts/test008-concurrency,v 1.33 2004/01/01 18:15:41 kurt Exp $  # $OpenLDAP: pkg/ldap/tests/scripts/test008-concurrency,v 1.38 2005/09/30 05:32:49 hyc 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 20  mkdir -p $TESTDIR $DBDIR1 Line 20  mkdir -p $TESTDIR $DBDIR1
   
 echo "Running slapadd to build slapd database..."  echo "Running slapadd to build slapd database..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1  . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
 $SLAPADD -f $CONF1 -l $LDIFORDERED -d -1 2> /tmp/slapadd.log  $SLAPADD -f $CONF1 -l $LDIFORDERED -d -1 2> $SLAPADDLOG1
 RC=$?  RC=$?
 if test $RC != 0 ; then  if test $RC != 0 ; then
         echo "slapadd failed ($RC)!"          echo "slapadd failed ($RC)!"
         exit $RC          exit $RC
 fi  fi
   
 echo "Waiting 5 seconds for slapadd to build slapd database..."  
 sleep 5  
   
 echo "Starting slapd on TCP/IP port $PORT1..."  echo "Starting slapd on TCP/IP port $PORT1..."
 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &  $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
 PID=$!  PID=$!
Line 39  if test $WAIT != 0 ; then Line 36  if test $WAIT != 0 ; then
 fi  fi
 KILLPIDS="$PID"  KILLPIDS="$PID"
   
   sleep 1
   
 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 $PORT1 \
Line 52  for i in 0 1 2 3 4 5; do Line 51  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  time $SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -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

Removed from v.1.34  
changed lines
  Added in v.1.34.2.4


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