X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Frun.in;h=4db73e8c1769dfecef3f7909a69e055626bc26f5;hb=59fe5917c5cc1484ff68d917c284d3c979f15a53;hp=f4a46d47ce078b391d17ab5fcaa94648eceb2ea0;hpb=88c039607518e62d035ab7479c8a31970ba85977;p=openldap

diff --git a/tests/run.in b/tests/run.in
index f4a46d47ce..4db73e8c17 100644
--- a/tests/run.in
+++ b/tests/run.in
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -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,32 +44,27 @@ 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@WITH_ACI_ENABLED@
+AC_THREADS=threads@BUILD_THREAD@
 
-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
+export AC_bdb AC_hdb AC_ldap AC_ldbm AC_meta AC_monitor AC_relay AC_sql \
+	AC_accesslog AC_dynlist AC_pcache AC_ppolicy AC_refint AC_retcode \
+	AC_rwm AC_unique AC_syncprov AC_translucent AC_valsort \
+	AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED AC_ACI_ENABLED \
+	AC_THREADS
 
 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
@@ -82,7 +79,7 @@ while test $# -gt 0 ; do
 
 		-c | -clean)
 			CLEAN=yes
-			shift; shift ;;
+			shift ;;
 
 		-k | -kill)
 			KILLSERVERS=no
@@ -113,6 +110,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"
@@ -123,6 +132,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
@@ -138,20 +150,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
 
@@ -160,8 +172,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
@@ -173,9 +185,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