Fix typos in error messages

[openldap] / tests / run.in

diff --git a/tests/run.in b/tests/run.in
index 08de40e8ace49f245db8761e98e250dd8a5dc69f..8b2642e2f950f7faaec79ba2cbd5f62f2196c568 100644 (file)
--- 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-2003 The OpenLDAP Foundation.
+## Copyright 1998-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -19,29 +19,53 @@ USAGE="$0 [-b <backend>] [-c] [-k] [-p] [-u] [-w] <script>"
 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_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_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 AC_ACI_ENABLED
+export AC_valsort
 
 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
@@ -92,7 +116,11 @@ while test $# -gt 0 ; do
        esac
 done
 
-export BACKEND WAIT KILLSERVERS PRESERVE USERDATA
+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
@@ -119,9 +147,6 @@ fi
 if test ! -r schema/core.schema ; then
        ${LN_S} ${TOPSRCDIR}/servers/slapd/schema schema
 fi
-if test ! -r ucdata/UnicodeData.txt ; then
-       ${LN_S} ../libraries/liblunicode ucdata
-fi
 
 if test -d testrun ; then
        if test $PRESERVE = no ; then
@@ -153,7 +178,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