back-sock by Brian Candler (B.Candler@pobox.com) ITS#4094 (untested)

[openldap] / tests / run.in

diff --git a/tests/run.in b/tests/run.in
index a8bcaa1cacf41ad0cf4d7534cee642db88ae46c3..24133fbcb5d33e0156059cd874b8f927dfb082eb 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -55,10 +55,10 @@ AC_THREADS=threads@BUILD_THREAD@
 AC_LIBS_DYNAMIC=lib@BUILD_LIBS_DYNAMIC@
 
 # sanitize
-if test "${AC_ldap}" = "ldapmod" -a "${AC_LIBS_DYNAMIC}" = "static" ; then
+if test "${AC_ldap}" = "ldapmod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
        AC_ldap="ldapno"
 fi
-if test "${AC_meta}" = "metamod" -a "${AC_LIBS_DYNAMIC}" = "static" ; then
+if test "${AC_meta}" = "metamod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
        AC_meta="metano"
 fi
 
@@ -176,22 +176,19 @@ if test -d ${TESTDIR} ; then
                /bin/rm -rf ${TESTDIR}/db.*
        fi
 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
 
 # disable LDAP initialization
 LDAPNOINIT=true; export LDAPNOINIT
 
-$SLAPPASSWD -g -n >$CONFIGPWF
-echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >configpw.conf
-
 echo "Running ${SCRIPT}..."
 $SCRIPT $*
 RC=$?