From: Hallvard Furuseth <hallvard@openldap.org>
Date: Thu, 29 Sep 2005 23:30:54 +0000 (+0000)
Subject: Use $CONFFILTER.  Parametrize testrun directory.
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~349
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=33d18bc93d9690ec13160be3aade8bcf1a884c91;p=openldap

Use $CONFFILTER.  Parametrize testrun directory.
---

diff --git a/tests/scripts/passwd-search b/tests/scripts/passwd-search
index 8c7ca24abb..bd9f66adf7 100755
--- a/tests/scripts/passwd-search
+++ b/tests/scripts/passwd-search
@@ -27,12 +27,13 @@ echo "running defines.sh $SRCDIR $BACKEND"
 
 if test -d "$TESTDIR"; then
 	echo "Cleaning up in $TESTDIR..."
-	/bin/rm -rf testrun/db.*
+	/bin/rm -rf $TESTDIR/db.*
 fi
 mkdir -p $TESTDIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $PASSWDCONF -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+. $CONFFILTER $BACKEND $MONITORDB < $PASSWDCONF > $CONF1
+$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
 PID=$!
 if test ${WAIT-0} != 0 ; then
     echo PID $PID