ITS#4750 only read LDAP_CONF_FILE if geteuid() != getuid()

[openldap] / tests / run.in

diff --git a/tests/run.in b/tests/run.in
index 949cae538234ba9a7567a3101975375da4c67f64..476b5339baf6429fad068128a68ab6d6b09b24b3 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-2005 The OpenLDAP Foundation.
+## Copyright 1998-2008 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -13,7 +13,7 @@
 ## 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>"
+USAGE="$0 [-b <backend>] [-c] [-k] [-p] [-s {ro|rp}] [-u] [-w] <script>"
 
 # configure generated
 SRCDIR="@srcdir@"
@@ -27,13 +27,16 @@ export SRCDIR TOPSRCDIR LN_S EGREP_CMD
 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_dds=dds@BUILD_DDS@
+AC_dynlist=dynlist@BUILD_DYNLIST@
+AC_memberof=memberof@BUILD_MEMBEROF@
 AC_pcache=pcache@BUILD_PROXYCACHE@
 AC_ppolicy=ppolicy@BUILD_PPOLICY@
 AC_refint=refint@BUILD_REFINT@
@@ -49,11 +52,23 @@ AC_WITH_SASL=@WITH_SASL@
 AC_WITH_TLS=@WITH_TLS@
 AC_WITH_MODULES_ENABLED=@WITH_MODULES_ENABLED@
 AC_ACI_ENABLED=aci@WITH_ACI_ENABLED@
+AC_THREADS=threads@BUILD_THREAD@
+AC_LIBS_DYNAMIC=lib@BUILD_LIBS_DYNAMIC@
 
-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
+# sanitize
+if test "${AC_ldap}" = "ldapmod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
+       AC_ldap="ldapno"
+fi
+if test "${AC_meta}" = "metamod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
+       AC_meta="metano"
+fi
+
+export AC_bdb AC_hdb AC_ldap AC_meta AC_monitor AC_relay AC_sql \
+       AC_accesslog AC_dds AC_dynlist AC_memberof AC_pcache AC_ppolicy \
+       AC_refint AC_retcode AC_rwm AC_unique AC_syncprov AC_translucent \
+       AC_valsort \
+       AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED AC_ACI_ENABLED \
+       AC_THREADS AC_LIBS_DYNAMIC
 
 if test ! -x ../servers/slapd/slapd ; then
        echo "Could not locate slapd(8)"
@@ -65,6 +80,7 @@ CLEAN=no
 WAIT=0
 KILLSERVERS=yes
 PRESERVE=${PRESERVE-no}
+SYNCMODE=
 USERDATA=no
 
 while test $# -gt 0 ; do
@@ -85,6 +101,18 @@ while test $# -gt 0 ; do
                        PRESERVE=yes
                        shift ;;
 
+               -s | -syncmode)
+                       case "$2" in
+                               ro | rp)
+                                       SYNCMODE="$2"
+                                       ;;
+                               *)
+                                       echo "unknown sync mode $2"
+                                       echo "$USAGE"; exit 1
+                                       ;;
+                       esac
+                       shift; shift ;;
+
                -u | -userdata)
                        USERDATA=yes
                        shift ;;
@@ -107,7 +135,7 @@ while test $# -gt 0 ; do
 done
 
 if test -z "$BACKEND" ; then
-       for b in bdb ldbm hdb ; do
+       for b in bdb hdb ; do
                if eval "test \"\$AC_$b\" != no" ; then
                        BACKEND=$b
                        break
@@ -122,7 +150,7 @@ BACKENDTYPE=`eval 'echo $AC_'$BACKEND`
 if test "x$BACKENDTYPE" = "x" ; then
        BACKENDTYPE="unknown"
 fi
-export BACKEND BACKENDTYPE WAIT KILLSERVERS PRESERVE USERDATA
+export BACKEND BACKENDTYPE WAIT KILLSERVERS PRESERVE SYNCMODE USERDATA
 
 if test $# = 0 ; then
        echo "$USAGE"; exit 1
@@ -162,13 +190,23 @@ if test -d ${TESTDIR} ; then
                /bin/rm -rf ${TESTDIR}/db.*
        fi
 fi
+if test $BACKEND = ndb ; then
+       mysql --user root <<EOF
+       drop database if exists db_1;
+       drop database if exists db_2;
+       drop database if exists db_3;
+       drop database if exists db_4;
+       drop database if exists db_5;
+       drop database if exists db_6;
+EOF
+fi
+mkdir -p ${TESTDIR}
 
 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