line up test030 and test032; first step toward their merge

[openldap] / tests / run.in

diff --git a/tests/run.in b/tests/run.in
index 8bceaded12f95a0ccf7296e112ce8b9689e1d230..e0ecc26fa4d9fc4386fb39a10f718dfda0375476 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -1,4 +1,17 @@
 #!/bin/sh
+# $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2004 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>"
 
@@ -9,26 +22,44 @@ 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_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_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
@@ -37,7 +68,7 @@ fi
 CLEAN=no
 WAIT=0
 KILLSERVERS=yes
-PRESERVE=no
+PRESERVE=${PRESERVE-no}
 USERDATA=no
 
 while test $# -gt 0 ; do
@@ -79,7 +110,8 @@ while test $# -gt 0 ; do
        esac
 done
 
-export BACKEND WAIT KILLSERVERS PRESERVE USERDATA
+BACKENDTYPE=`eval 'echo $AC_'$BACKEND`
+export BACKEND BACKENDTYPE WAIT KILLSERVERS PRESERVE USERDATA
 
 if test $# = 0 ; then
        echo "$USAGE"; exit 1
@@ -100,21 +132,18 @@ else
        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/lunicode ucdata
-fi
 
 if test -d testrun ; then
        if test $PRESERVE = no ; then
                echo "Cleaning up test run directory leftover from previous run."
                /bin/rm -rf testrun
-       else
+       elif test $PRESERVE = yes ; then
                echo "Cleaning up only database directories leftover from previous run."
                /bin/rm -rf testrun/db.*
        fi
@@ -140,7 +169,7 @@ if test $CLEAN = yes ; then
        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