Diff for /tests/scripts/test036-meta-concurrency between versions 1.17 and 1.17.2.5

version 1.17, 2006/03/03 15:03:05 version 1.17.2.5, 2008/02/11 23:26:51
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
 # $OpenLDAP: pkg/ldap/tests/scripts/test036-meta-concurrency,v 1.16 2006/02/03 16:58:07 ando Exp $  # $OpenLDAP: pkg/ldap/tests/scripts/test036-meta-concurrency,v 1.17.2.4 2007/10/18 00:20:07 quanah 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-2006 The OpenLDAP Foundation.  ## Copyright 1998-2008 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 23  if test $BACKMETA = metano ; then Line 23  if test $BACKMETA = metano ; then
         exit 0          exit 0
 fi  fi
   
 # to be removed some time...  
 if test "x$TEST_META" = "xno" ; then  
         echo '### Test disabled by "TEST_META=no"; unset TEST_META to re-enable'  
         echo ""  
         exit 0  
 else  
         echo "### this test is experimental; in case of problems,"  
         echo "### set \"TEST_META=no\" to disable, and report thru"  
         echo "### the Issue Tracking System <http://www.openldap.org/its/>"  
         echo ""  
 fi  
   
 if test x$TESTLOOPS = x ; then  if test x$TESTLOOPS = x ; then
         TESTLOOPS=50          TESTLOOPS=50
 fi  fi
Line 60  if test "$BACKEND" = "bdb" || test "$BAC Line 48  if test "$BACKEND" = "bdb" || test "$BAC
 fi  fi
   
 echo "Starting slapd on TCP/IP port $PORT1..."  echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1  . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 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
Line 198  done Line 186  done
   
 echo "Using tester for concurrent server access..."  echo "Using tester for concurrent server access..."
 $SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR/$DATADIR" -h $LOCALHOST -p $PORT3 \  $SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR/$DATADIR" -h $LOCALHOST -p $PORT3 \
         -D "cn=Manager,$METABASEDN" -w $PASSWD -l $TESTLOOPS -r 20 -FF          -D "cn=Manager,$METABASEDN" -w $PASSWD -l $TESTLOOPS -r 20 -FF \
           -i '!REFERRAL'
 RC=$?  RC=$?
   
 if test $RC != 0 ; then  if test $RC != 0 ; then

Removed from v.1.17  
changed lines
  Added in v.1.17.2.5


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