X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest002-populate;h=afd5ca213827b0bb8125962d897ced03bd3b5767;hb=c8c34cdd43d3603f3b64a56841b4425379c98f45;hp=5586535e13204a4e309bee546ec02530372f967b;hpb=e0df7582b888559f2e0bc4b02d18901a462ea1b6;p=openldap
diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 5586535e13..afd5ca2138 100755
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -1,10 +1,22 @@
#! /bin/sh
# $OpenLDAP$
+## This work is part of OpenLDAP Software .
+##
+## Copyright 1998-2011 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## .
echo "running defines.sh"
. $SRCDIR/scripts/defines.sh
-mkdir -p $TESTRUN $DBDIR1
+mkdir -p $TESTDIR $DBDIR1
echo "Starting slapd on TCP/IP port $PORT1..."
. $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
@@ -16,6 +28,8 @@ if test $WAIT != 0 ; then
fi
KILLPIDS="$PID"
+sleep 1
+
echo "Using ldapsearch to check that slapd is running..."
for i in 0 1 2 3 4 5; do
$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
@@ -51,9 +65,9 @@ if test $RC != 0 ; then
fi
echo "Filtering ldapsearch results..."
-. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Filtering original ldif used to create database..."
-. $LDIFFILTER < $LDIF > $LDIFFLT
+$LDIFFILTER < $LDIF > $LDIFFLT
echo "Comparing filter output..."
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
@@ -63,4 +77,7 @@ if test $? != 0 ; then
fi
echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
exit 0