X-Git-Url: https://git.sur5r.net/?p=openldap;a=blobdiff_plain;f=tests%2Fdata%2Fregressions%2Fits8752%2Fits8752;h=0a8150fb0aa29edf5b30478a670f3c53dc645c1d;hp=c851f561c1e642724ceb359a99f22390cd91b5f5;hb=626d7e6db5a5a8467693c6c1fb261aa4066a0021;hpb=f535d06d0741ecd6b1312c9e83b0c05dc4e79f6e diff --git a/tests/data/regressions/its8752/its8752 b/tests/data/regressions/its8752/its8752 index c851f561c1..0a8150fb0a 100755 --- a/tests/data/regressions/its8752/its8752 +++ b/tests/data/regressions/its8752/its8752 @@ -150,6 +150,7 @@ fi echo "Stopping slapd and reworking configuration for MMR..." test $KILLSERVERS != no && kill -HUP $KILLPIDS +wait $KILLPIDS KILLPIDS= n=1 @@ -158,19 +159,19 @@ while [ $n -le $MMR ]; do MYLOG=`eval echo '$LOG'$n` MYCONF=`eval echo '$CONF'$n` echo "Starting provider slapd on TCP/IP URI $MYURI" - . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf.mmr > $CONF - sed -e "s/MMR/$n/g" $CONF > $MYCONF + . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf.mmr > $TESTDIR/slapd.conf + sed -e "s/MMR/$n/g" $TESTDIR/slapd.conf > $MYCONF j=1 while [ $j -le $MMR ]; do MMCURI=`eval echo '$URI'$j` - sed -e "s|MMC${j}|${MMCURI}|" $MYCONF > $CONF - mv $CONF $MYCONF + sed -e "s|MMC${j}|${MMCURI}|" $MYCONF > $TESTDIR/slapd.conf + mv $TESTDIR/slapd.conf $MYCONF j=`expr $j + 1` done - if [ -f $CONF ]; then - rm -f $CONF + if [ -f $TESTDIR/slapd.conf ]; then + rm -f $TESTDIR/slapd.conf fi - $SLAPD -f $MYCONF -h $MYURI -d $LVL $TIMING > $MYLOG 2>&1 & + $SLAPD -f $MYCONF -h $MYURI -d $LVL $TIMING >> $MYLOG 2>&1 & PID=$! if test $WAIT != 0 ; then echo PID $PID