(Partial) Sync with HEAD

[openldap] / tests / run.in

diff --git a/tests/run.in b/tests/run.in
index 246a27a90794670951f738e3ed1cba584681e42e..e8b770d63a3046a67b0367a272ee249251d85f57 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-2003 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,27 @@ LN_S="@LN_S@"
 
 export SRCDIR TOPSRCDIR LN_S
 
-AC_BDB=@BUILD_BDB@
-AC_HDB=@BUILD_HDB@
-AC_LDBM=@BUILD_LDBM@
+AC_bdb=@BUILD_BDB@
+AC_hdb=@BUILD_HDB@
+AC_ldbm=@BUILD_LDBM@
+AC_ldap=ldap@BUILD_LDAP@
+AC_pcache=pcache@BUILD_PROXYCACHE@
 AC_MONITOR=@BUILD_MONITOR@
-AC_CACHE=@BUILD_CACHE@
 AC_WITH_TLS=@WITH_TLS@
 
-export AC_MONITOR AC_CACHE AC_WITH_TLS
+export AC_MONITOR AC_WITH_TLS AC_ldap AC_pcache
 
 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
@@ -79,7 +93,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