X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=tests%2Frun.in;h=1becdae104f74dfe89ddd7c9ac68e031e04c086a;hb=df479246f6aef59f1414557ecffbc380359c303c;hp=e880f882054f6116c4e8e9c6bb791f115cce8d1f;hpb=9e9137cb74288a462e2b1ca0501baa2d0b19fe6d;p=openldap

diff --git a/tests/run.in b/tests/run.in
index e880f88205..1becdae104 100644
--- a/tests/run.in
+++ b/tests/run.in
@@ -19,8 +19,9 @@ USAGE="$0 [-b <backend>] [-c] [-k] [-p] [-u] [-w] <script>"
 SRCDIR="@srcdir@"
 TOPSRCDIR="@top_srcdir@"
 LN_S="@LN_S@"
+EGREP_CMD="@EGREP@"
 
-export SRCDIR TOPSRCDIR LN_S
+export SRCDIR TOPSRCDIR LN_S EGREP_CMD
 
 # backends
 AC_bdb=@BUILD_BDB@
@@ -33,7 +34,8 @@ AC_relay=relay@BUILD_RELAY@
 AC_sql=sql@BUILD_SQL@
 
 # overlays
-AC_glue=glue@BUILD_GLUE@
+AC_accesslog=accesslog@BUILD_ACCESSLOG@
+AC_dynlist=dynlist@BUILD_DYNLIST@
 AC_pcache=pcache@BUILD_PROXYCACHE@
 AC_ppolicy=ppolicy@BUILD_PPOLICY@
 AC_refint=refint@BUILD_REFINT@
@@ -42,33 +44,25 @@ AC_translucent=translucent@BUILD_TRANSLUCENT@
 AC_unique=unique@BUILD_UNIQUE@
 AC_rwm=rwm@BUILD_RWM@
 AC_syncprov=syncprov@BUILD_SYNCPROV@
+AC_valsort=valsort@BUILD_VALSORT@
 
 # misc
 AC_WITH_SASL=@WITH_SASL@
 AC_WITH_TLS=@WITH_TLS@
 AC_WITH_MODULES_ENABLED=@WITH_MODULES_ENABLED@
-AC_ACI_ENABLED=aci@SLAPD_ACI_ENABLED@
+AC_ACI_ENABLED=aci@WITH_ACI_ENABLED@
 
 export AC_bdb AC_hdb AC_ldap AC_ldbm AC_meta AC_monitor AC_relay AC_sql 
-export AC_glue AC_pcache AC_ppolicy AC_refint AC_retcode AC_rwm AC_unique AC_syncprov
-export AC_translucent AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED AC_ACI_ENABLED
+export AC_accesslog AC_dynlist AC_pcache AC_ppolicy AC_refint AC_retcode
+export AC_rwm AC_unique AC_syncprov AC_translucent AC_valsort
+export AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED AC_ACI_ENABLED
 
 if test ! -x ../servers/slapd/slapd ; then
 	echo "Could not locate slapd(8)"
 	exit 1
 fi
 
-if test $AC_bdb != no ; then
-	BACKEND=bdb
-elif test $AC_ldbm != no ; then
-	BACKEND=ldbm
-elif test $AC_hdb != no ; then
-	BACKEND=hdb
-else
-	echo "Not configured with a suitable database backend"
-	exit 1
-fi
-
+BACKEND=
 CLEAN=no
 WAIT=0
 KILLSERVERS=yes
@@ -83,7 +77,7 @@ while test $# -gt 0 ; do
 
 		-c | -clean)
 			CLEAN=yes
-			shift; shift ;;
+			shift ;;
 
 		-k | -kill)
 			KILLSERVERS=no
@@ -114,6 +108,18 @@ while test $# -gt 0 ; do
 	esac
 done
 
+if test -z "$BACKEND" ; then
+	for b in bdb ldbm hdb ; do
+		if eval "test \"\$AC_$b\" != no" ; then
+			BACKEND=$b
+			break
+		fi
+	done
+	if test -z "$BACKEND" ; then
+		echo "No suitable default database backend configured" >&2
+		exit 1
+	fi
+fi
 BACKENDTYPE=`eval 'echo $AC_'$BACKEND`
 if test "x$BACKENDTYPE" = "x" ; then
 	BACKENDTYPE="unknown"
@@ -124,6 +130,9 @@ if test $# = 0 ; then
 	echo "$USAGE"; exit 1
 fi
 
+# need defines.sh for the definitions of the directories
+. $SRCDIR/scripts/defines.sh
+
 SCRIPTDIR="${SRCDIR}/scripts"
 SCRIPTNAME="$1"
 shift
@@ -139,20 +148,20 @@ else
 	exit 1;
 fi
 
-if test ! -r testdata/test.ldif ; then
-	${LN_S} ${SRCDIR}/data testdata
+if test ! -r ${DATADIR}/test.ldif ; then
+	${LN_S} ${SRCDIR}/data ${DATADIR}
 fi
-if test ! -r schema/core.schema ; then
-	${LN_S} ${TOPSRCDIR}/servers/slapd/schema schema
+if test ! -r ${SCHEMADIR}/core.schema ; then
+	${LN_S} ${TOPSRCDIR}/servers/slapd/schema ${SCHEMADIR}
 fi
 
-if test -d testrun ; then
+if test -d ${TESTDIR} ; then
 	if test $PRESERVE = no ; then
 		echo "Cleaning up test run directory leftover from previous run."
-		/bin/rm -rf testrun
+		/bin/rm -rf ${TESTDIR}
 	elif test $PRESERVE = yes ; then
 		echo "Cleaning up only database directories leftover from previous run."
-		/bin/rm -rf testrun/db.*
+		/bin/rm -rf ${TESTDIR}/db.*
 	fi
 fi
 
@@ -161,8 +170,8 @@ if test $USERDATA = yes ; then
 		echo "User data directory (userdata) does not exist."
 		exit 1
 	fi
-	mkdir -p testrun
-	cp -R userdata/* testrun
+	mkdir -p ${TESTDIR}
+	cp -R userdata/* ${TESTDIR}
 fi
 
 # disable LDAP initialization
@@ -174,9 +183,9 @@ RC=$?
 
 if test $CLEAN = yes ; then
 	echo "Cleaning up test run directory from this run."
-	/bin/rm -rf testrun
+	/bin/rm -rf ${TESTDIR}
 	echo "Cleaning up symlinks."
-	/bin/rm -f testdata schema
+	/bin/rm -f ${DATADIR} ${SCHEMADIR}
 fi
 
 exit $RC