More fixes, add test script

[openldap] / tests / run.in

diff --git a/tests/run.in b/tests/run.in
index f5c11b14ec65595587777dc50de733c5830c2bd0..cbf20d1222f7e43b58a443f9a9ca6fa01e55863f 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-2007 The OpenLDAP Foundation.
+## Copyright 1998-2011 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] [-l #] [-p] [-s {ro|rp}] [-u] [-w] <script>"
 
 # configure generated
 SRCDIR="@srcdir@"
@@ -23,9 +23,13 @@ EGREP_CMD="@EGREP@"
 
 export SRCDIR TOPSRCDIR LN_S EGREP_CMD
 
-# backends
+# backends known to ./run -b <backend> (used to deduce $BACKENDTYPE)
 AC_bdb=@BUILD_BDB@
 AC_hdb=@BUILD_HDB@
+AC_ldif=yes
+AC_null=@BUILD_NULL@
+
+# other backends
 AC_ldap=ldap@BUILD_LDAP@
 AC_meta=meta@BUILD_META@
 AC_monitor=@BUILD_MONITOR@
@@ -36,6 +40,7 @@ AC_sql=sql@BUILD_SQL@
 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@
@@ -55,17 +60,17 @@ 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
 
-export AC_bdb AC_hdb AC_ldap AC_meta AC_monitor AC_relay AC_sql \
-       AC_accesslog AC_dynlist AC_pcache AC_ppolicy AC_refint AC_retcode \
-       AC_rwm AC_unique AC_syncprov AC_translucent AC_valsort \
-       AC_dds \
+export AC_bdb AC_hdb AC_ldap AC_meta AC_monitor AC_null 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
 
@@ -79,7 +84,10 @@ CLEAN=no
 WAIT=0
 KILLSERVERS=yes
 PRESERVE=${PRESERVE-no}
+SYNCMODE=${SYNCMODE-rp}
 USERDATA=no
+LOOP=1
+COUNTER=1
 
 while test $# -gt 0 ; do
        case "$1" in
@@ -94,11 +102,33 @@ while test $# -gt 0 ; do
                -k | -kill)
                        KILLSERVERS=no
                        shift ;;
+               -l | -loop)
+                       NUM="`echo $2 | sed 's/[0-9]//g'`"
+                       if [ -z "$NUM" ]; then
+                               LOOP=$2
+                       else
+                               echo "Loop variable not an int: $2"
+                               echo "$USAGE"; exit 1
+                       fi
+                       shift ;
+                       shift ;;
 
                -p | -preserve)
                        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 ;;
@@ -136,7 +166,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
@@ -176,6 +206,16 @@ 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
@@ -189,15 +229,29 @@ fi
 # disable LDAP initialization
 LDAPNOINIT=true; export LDAPNOINIT
 
-echo "Running ${SCRIPT}..."
-$SCRIPT $*
-RC=$?
+echo "Running ${SCRIPT} for ${BACKEND}..."
+while [ $COUNTER -le $LOOP ]; do
+       if [ $LOOP -gt 1 ]; then
+               echo "Running $COUNTER of $LOOP iterations"
+       fi
+       $SCRIPT $*
+       RC=$?
 
-if test $CLEAN = yes ; then
-       echo "Cleaning up test run directory from this run."
-       /bin/rm -rf ${TESTDIR}
-       echo "Cleaning up symlinks."
-       /bin/rm -f ${DATADIR} ${SCHEMADIR}
-fi
+       if test $CLEAN = yes ; then
+               echo "Cleaning up test run directory from this run."
+               /bin/rm -rf ${TESTDIR}
+               echo "Cleaning up symlinks."
+               /bin/rm -f ${DATADIR} ${SCHEMADIR}
+       fi
 
+       if [ $RC -ne 0 ]; then
+               exit $RC
+       else
+               COUNTER=`expr $COUNTER + 1`
+               if [ $COUNTER -le $LOOP ]; then
+                       echo "Cleaning up test run directory from this run."
+                       /bin/rm -rf ${TESTDIR}
+               fi
+       fi
+done
 exit $RC