ITS#8800 -- Fix database name

[openldap] / tests / data / regressions / its8800 / its8800

diff --git a/tests/data/regressions/its8800/its8800 b/tests/data/regressions/its8800/its8800
index beacff1024b8f95fd87ac0994378701601edf56c..352faf14cf7b9475e437a8140112763740ad308b 100755 (executable)
--- a/tests/data/regressions/its8800/its8800
+++ b/tests/data/regressions/its8800/its8800
@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
@@ -58,7 +58,7 @@ while [ $n -le $MMR ]; do
        mkdir -p ${XDIR}$n $DBDIR.1 $DBDIR.2 $CFDIR
        . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider${n}.ldif > $CONFLDIF
        $SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
-       $SLAPADD -F $CFDIR -q -b $BASEDN -l $ITSDIR/its8800db.ldif
+       $SLAPADD -F $CFDIR -q -b $BASEDN -l $ITSDIR/db.ldif
        n=`expr $n + 1`
 done
 
@@ -78,7 +78,9 @@ while [ $n -le $MMR ]; do
                read foo
        fi
        KILLPIDS="$PID $KILLPIDS"
-       PIDS[$n]="$PID"
+       if [ $n = 1 ]; then
+               MPID="$PID"
+       fi
        sleep 1
 
        echo "Using ldapsearch to check that provider slapd is running..."
@@ -127,8 +129,9 @@ sleep 60
 echo "done"
 
 echo -n "Stopping MMR1 slapd..."
-kill -HUP "${PIDS[1]}"
-wait ${PIDS[1]}
+kill -HUP $MPID
+wait $MPID
+KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $MPID / /"`;
 sleep $SLEEP2
 echo "done"
 
@@ -138,7 +141,7 @@ CFDIR="$TESTDIR/srv1/slapd.d"
 mv $DBDIR.1 $DBDIR.1.orig
 mv $DBDIR.2 $DBDIR.2.orig
 mkdir -p $DBDIR.1 $DBDIR.2
-$SLAPADD -F $CFDIR -q -b $BASEDN -l $ITSDIR/its8800db.ldif
+$SLAPADD -F $CFDIR -q -b $BASEDN -l $ITSDIR/db.ldif
 echo "done"
 
 echo "Starting provider1 slapd on TCP/IP URI $URI1"
@@ -150,7 +153,7 @@ if test $WAIT != 0 ; then
        echo PID $PID
        read foo
 fi
-PIDS[1]=$PID
+KILLPIDS="$PID $KILLPIDS"
 sleep 1
 
 echo "Using ldapsearch to check that provider slapd is running..."
@@ -165,13 +168,6 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 
-n=1
-KILLPIDS=
-while [ $n -le 4 ]; do
-       KILLPIDS="${PIDS[$n]} $KILLPIDS"
-       n=`expr $n + 1`
-done
-
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS