cosmetic changes

[openldap] / tests / run.in

diff --git a/tests/run.in b/tests/run.in
index 424da60fc09be2c484785e375cebd226aca30e16..5b212f2386a8c1ed94c6cf14b1e70c71b9b83b81 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -1,6 +1,19 @@
 #!/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@"
@@ -9,26 +22,45 @@ 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@
+# 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_glue=glue@BUILD_GLUE@
+AC_pcache=pcache@BUILD_PROXYCACHE@
+AC_ppolicy=ppolicy@BUILD_PPOLICY@
+AC_refint=refint@BUILD_REFINT@
+AC_unique=unique@BUILD_UNIQUE@
+AC_rwm=rwm@BUILD_RWM@
+AC_syncprov=syncprov@BUILD_SYNCPROV@
+
+# misc
+AC_WITH_SASL=@WITH_SASL@
 AC_WITH_TLS=@WITH_TLS@
+AC_WITH_MODULES_ENABLED=@WITH_MODULES_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_glue AC_pcache AC_ppolicy AC_refint AC_unique AC_rwm AC_syncprov
+export AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED
 
 if test ! -x ../servers/slapd/slapd ; then
        echo "Could not locate slapd(8)"
        exit 1
 fi
 
-if test $AC_BDB = yes ; then
+if test $AC_bdb != no ; then
        BACKEND=bdb
-elif test $AC_LDBM = yes ; then
+elif test $AC_ldbm != no ; then
        BACKEND=ldbm
-elif test $AC_HDB = yes ; then
-       BACKEND=hdbm
+elif test $AC_hdb != no ; then
+       BACKEND=hdb
 else
        echo "Not configured with a suitable database backend"
        exit 1
@@ -36,6 +68,9 @@ fi
 
 CLEAN=no
 WAIT=0
+KILLSERVERS=yes
+PRESERVE=${PRESERVE-no}
+USERDATA=no
 
 while test $# -gt 0 ; do
        case "$1" in
@@ -47,8 +82,20 @@ while test $# -gt 0 ; do
                        CLEAN=yes
                        shift; shift ;;
 
+               -k | -kill)
+                       KILLSERVERS=no
+                       shift ;;
+
+               -p | -preserve)
+                       PRESERVE=yes
+                       shift ;;
+
+               -u | -userdata)
+                       USERDATA=yes
+                       shift ;;
+
                -w | -wait)
-                       CLEAN=1
+                       WAIT=1
                        shift ;;
 
                -)
@@ -64,31 +111,53 @@ while test $# -gt 0 ; do
        esac
 done
 
-export BACKEND WAIT
+BACKENDTYPE=`eval 'echo $AC_'$BACKEND`
+export BACKEND BACKENDTYPE WAIT KILLSERVERS PRESERVE USERDATA
 
 if test $# = 0 ; then
        echo "$USAGE"; exit 1
 fi
-SCRIPT="${SRCDIR}/scripts/$1"
+
+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
+if test ! -r testdata/test.ldif ; then
        ${LN_S} ${SRCDIR}/data testdata
 fi
-if test ! -e schema/core.schema ; then
+if test ! -r schema/core.schema ; then
        ${LN_S} ${TOPSRCDIR}/servers/slapd/schema schema
 fi
-if test ! -e ucdata/UnicodeData.txt ; then
-       ${LN_S} ${TOPSRCDIR}/libraries/liblunicode ucdata
+
+if test -d testrun ; then
+       if test $PRESERVE = no ; then
+               echo "Cleaning up test run directory leftover from previous run."
+               /bin/rm -rf testrun
+       elif test $PRESERVE = yes ; then
+               echo "Cleaning up only database directories leftover from previous run."
+               /bin/rm -rf testrun/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 testrun
+       cp -R userdata/* testrun
+fi
 
 # disable LDAP initialization
 LDAPNOINIT=true; export LDAPNOINIT
@@ -98,10 +167,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 testrun
        echo "Cleaning up symlinks."
-       /bin/rm -f testdata schema ucdata
+       /bin/rm -f testdata schema
 fi
 
 exit $RC