From d11ae735deeedb3341882da42cc0ef0cb32e43c7 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Tue, 13 Feb 2018 01:42:35 +0000 Subject: [PATCH] ITS#8800 -- Remove bash requirement --- tests/data/regressions/its8800/its8800 | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/tests/data/regressions/its8800/its8800 b/tests/data/regressions/its8800/its8800 index beacff1024..630f8824cb 100755 --- 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 . ## @@ -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" @@ -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 -- 2.39.5