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

diff --git a/tests/run.in b/tests/run.in
index 9e5f1d5cd9..1becdae104 100644
--- a/tests/run.in
+++ b/tests/run.in
@@ -1,41 +1,73 @@
 #!/bin/sh
-
-USAGE="$0 [-b <backend>] <script>"
+# $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2005 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
+## <http://www.OpenLDAP.org/license.html>.
+
+USAGE="$0 [-b <backend>] [-c] [-k] [-p] [-u] [-w] <script>"
 
 # configure generated
 SRCDIR="@srcdir@"
 TOPSRCDIR="@top_srcdir@"
 LN_S="@LN_S@"
-
-export SRCDIR TOPSRCDIR LN_S
-
-AC_BDB=@BUILD_BDB@
-AC_HDB=@BUILD_HDB@
-AC_LDBM=@BUILD_LDBM@
-AC_MONITOR=@BUILD_MONITOR@
-AC_CACHE=@BUILD_CACHE@
+EGREP_CMD="@EGREP@"
+
+export SRCDIR TOPSRCDIR LN_S EGREP_CMD
+
+# backends
+AC_bdb=@BUILD_BDB@
+AC_hdb=@BUILD_HDB@
+AC_ldap=ldap@BUILD_LDAP@
+AC_ldbm=@BUILD_LDBM@
+AC_meta=meta@BUILD_META@
+AC_monitor=@BUILD_MONITOR@
+AC_relay=relay@BUILD_RELAY@
+AC_sql=sql@BUILD_SQL@
+
+# overlays
+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@
+AC_retcode=retcode@BUILD_RETCODE@
+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@
 
-export AC_MONITOR AC_CACHE AC_WITH_TLS
+export AC_bdb AC_hdb AC_ldap AC_ldbm AC_meta AC_monitor AC_relay AC_sql 
+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 = yes ; then
-	BACKEND=bdb
-elif test $AC_LDBM = yes ; then
-	BACKEND=ldbm
-elif test $AC_HDB = yes ; then
-	BACKEND=hdbm
-else
-	echo "Not configured with a suitable database backend"
-	exit 1
-fi
-
+BACKEND=
 CLEAN=no
 WAIT=0
+KILLSERVERS=yes
+PRESERVE=${PRESERVE-no}
+USERDATA=no
 
 while test $# -gt 0 ; do
 	case "$1" in
@@ -45,7 +77,19 @@ while test $# -gt 0 ; do
 
 		-c | -clean)
 			CLEAN=yes
-			shift; shift ;;
+			shift ;;
+
+		-k | -kill)
+			KILLSERVERS=no
+			shift ;;
+
+		-p | -preserve)
+			PRESERVE=yes
+			shift ;;
+
+		-u | -userdata)
+			USERDATA=yes
+			shift ;;
 
 		-w | -wait)
 			WAIT=1
@@ -64,31 +108,71 @@ while test $# -gt 0 ; do
 	esac
 done
 
-export BACKEND WAIT
+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"
+fi
+export BACKEND BACKENDTYPE WAIT KILLSERVERS PRESERVE USERDATA
 
 if test $# = 0 ; then
 	echo "$USAGE"; exit 1
 fi
-SCRIPT="${SRCDIR}/scripts/$1"
+
+# need defines.sh for the definitions of the directories
+. $SRCDIR/scripts/defines.sh
+
+SCRIPTDIR="${SRCDIR}/scripts"
+SCRIPTNAME="$1"
 shift
 
-if test ! -x "${SCRIPT}" ; then
-	echo "run: ${SCRIPT} not found (or not executable)"
+if test -x "${SCRIPTDIR}/${SCRIPTNAME}" ; then
+	SCRIPT="${SCRIPTDIR}/${SCRIPTNAME}"
+elif test -x "`echo ${SCRIPTDIR}/test*-${SCRIPTNAME}`"; then
+	SCRIPT="`echo ${SCRIPTDIR}/test*-${SCRIPTNAME}`"
+elif test -x "`echo ${SCRIPTDIR}/${SCRIPTNAME}-*`"; then
+	SCRIPT="`echo ${SCRIPTDIR}/${SCRIPTNAME}-*`"
+else
+	echo "run: ${SCRIPTNAME} not found (or not executable)"
 	exit 1;
 fi
 
-if test ! -e testdata/test.ldif ; then
-	${LN_S} ${SRCDIR}/data testdata
+if test ! -r ${DATADIR}/test.ldif ; then
+	${LN_S} ${SRCDIR}/data ${DATADIR}
 fi
-if test ! -e 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 ! -e ucdata/UnicodeData.txt ; then
-	${LN_S} ${TOPSRCDIR}/libraries/liblunicode ucdata
+
+if test -d ${TESTDIR} ; then
+	if test $PRESERVE = no ; then
+		echo "Cleaning up test run directory leftover from previous run."
+		/bin/rm -rf ${TESTDIR}
+	elif test $PRESERVE = yes ; then
+		echo "Cleaning up only database directories leftover from previous run."
+		/bin/rm -rf ${TESTDIR}/db.*
+	fi
 fi
 
-echo "Cleaning up directories leftover from previous run."
-/bin/rm -rf test-db test-repl test-db2 test-repl2 test-db3 test-repl3
+if test $USERDATA = yes ; then
+	if test ! -d userdata ; then
+		echo "User data directory (userdata) does not exist."
+		exit 1
+	fi
+	mkdir -p ${TESTDIR}
+	cp -R userdata/* ${TESTDIR}
+fi
 
 # disable LDAP initialization
 LDAPNOINIT=true; export LDAPNOINIT
@@ -98,10 +182,10 @@ $SCRIPT $*
 RC=$?
 
 if test $CLEAN = yes ; then
-	echo "Cleaning up directories leftover from this run."
-	/bin/rm -rf test-db test-repl test-db2 test-repl2 test-db3 test-repl3
+	echo "Cleaning up test run directory from this run."
+	/bin/rm -rf ${TESTDIR}
 	echo "Cleaning up symlinks."
-	/bin/rm -f testdata schema ucdata
+	/bin/rm -f ${DATADIR} ${SCHEMADIR}
 fi
 
 exit $RC