Diff for /tests/scripts/test036-meta-concurrency between versions 1.6.2.10 and 1.7

version 1.6.2.10, 2008/02/11 23:24:28 version 1.7, 2005/05/06 16:51:24
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
 # $OpenLDAP: pkg/ldap/tests/scripts/test036-meta-concurrency,v 1.6.2.9 2007/01/02 21:44:13 kurt Exp $  # $OpenLDAP: pkg/ldap/tests/scripts/test036-meta-concurrency,v 1.6 2005/04/25 22:06:08 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 25  fi Line 25  fi
   
 # to be removed some time...  # to be removed some time...
 if test "x$TEST_META" = "xno" ; then  if test "x$TEST_META" = "xno" ; then
         echo '### Test disabled by "TEST_META=no"; unset TEST_META to re-enable'          echo "### disabled by \"TEST_META=no\"; unset TEST_META to re-enable"
         echo ""          echo ""
         exit 0          exit 0
 else  else
Line 40  rm -rf $TESTDIR Line 40  rm -rf $TESTDIR
 mkdir -p $TESTDIR $DBDIR1 $DBDIR2  mkdir -p $TESTDIR $DBDIR1 $DBDIR2
   
 # NOTE: this could be added to all tests...  # NOTE: this could be added to all tests...
 if test "$BACKEND" = "bdb" || test "$BACKEND" = "hdb" ; then  if test "$BACKEND" = "bdb" -o "$BACKEND" = "hdb" ; then
         if test "x$DB_CONFIG" != "x" ; then \          if test "x$DB_CONFIG" != "x" ; then \
                 if test -f $DB_CONFIG ; then                  if test -f $DB_CONFIG ; then
                         echo "==> using DB_CONFIG \"$DB_CONFIG\""                          echo "==> using DB_CONFIG \"$DB_CONFIG\""
Line 65  if test $WAIT != 0 ; then Line 65  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 104  if test $WAIT != 0 ; then Line 102  if test $WAIT != 0 ; then
 fi  fi
 KILLPIDS="$KILLPIDS $PID"  KILLPIDS="$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 $PORT2 \          $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
Line 143  if test $WAIT != 0 ; then Line 139  if test $WAIT != 0 ; then
 fi  fi
 KILLPIDS="$KILLPIDS $PID"  KILLPIDS="$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 $PORT3 \          $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT3 \
Line 185  for f in $TESTDIR/$DATADIR/do_read.* ; d Line 179  for f in $TESTDIR/$DATADIR/do_read.* ; d
 done  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 50 # -r 20
         -D "cn=Manager,$METABASEDN" -w $PASSWD -l 50 -r 20 -F  
 RC=$?  RC=$?
   
 if test $RC != 0 ; then  if test $RC != 0 ; then
Line 215  echo "Comparing filter output..." Line 208  echo "Comparing filter output..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT  $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
   
 if test $? != 0 ; then  if test $? != 0 ; then
         echo "comparison failed - slapd-meta search/modification didn't succeed"          echo "comparison failed - meta search/modification didn't succeed"
         exit 1          exit 1
 fi  fi
   
 echo ">>>>> Test succeeded"  echo ">>>>> Test succeeded"
 exit 0  exit 0
   

Removed from v.1.6.2.10  
changed lines
  Added in v.1.7


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