X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Frun.in;h=24133fbcb5d33e0156059cd874b8f927dfb082eb;hb=2a14eaf5dd1664414f863b4395b674921e619b09;hp=0ab71e6c4d8de555b23737fe70238f65b74fe8d1;hpb=40053ac203bb67fe952adc359b9a5c244850d7cf;p=openldap

diff --git a/tests/run.in b/tests/run.in
index 0ab71e6c4d..24133fbcb5 100644
--- 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-2006 The OpenLDAP Foundation.
+## Copyright 1998-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -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 >configpw
-echo "rootpw `$SLAPPASSWD -T configpw`" >configpw.conf
-
 echo "Running ${SCRIPT}..."
 $SCRIPT $*
 RC=$?