First rounded of changes in prep for 2.2.beta3

[openldap] / tests / scripts / all

diff --git a/tests/scripts/all b/tests/scripts/all
index 3d44e9fc63bd5d0e88dc16ae1f7d36d8b998e096..223765e12ad10b8fd7c8c72e5162ae29b4e6da7c 100755 (executable)
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -1,49 +1,22 @@
 #! /bin/sh
 # $OpenLDAP$
 
-# disable LDAP initialization
-LDAPNOINIT=true; export LDAPNOINIT
-
-echo ">>>>> Executing all LDAP tests..."
-
-if test $# -eq 0 ; then
-       SRCDIR="."
-else
-       SRCDIR=$1; shift
-fi
-
-echo ">>>>> Test Directory: $SRCDIR"
-
-if test $# -eq 0 ; then
-       BACKEND=bdb
-else
-       BACKEND=$1; shift
-fi
-
-echo ">>>>> Backend: $BACKEND"
-
-MONITORDB=${MONITORDB-no}
-PROXYCACHE=${PROXYCACHE-no}
-BACKENDTYPE=${BACKENDTYPE-yes}
-
-export MONITORDB PROXYCACHE BACKENDTYPE
-
-echo ">>>>> Backend Type: $BACKENDTYPE"
-
-if test $# -eq 0 ; then
-       SYNCREPL=no
-else
-       SYNCREPL=$1; shift
-fi
-
 SHTOOL="$SRCDIR/../build/shtool"
-
 TB=`$SHTOOL echo -e "%B"`
 TN=`$SHTOOL echo -e "%b"`
 
+echo ">>>>> Executing all LDAP tests for $BACKEND"
+
 for CMD in $SRCDIR/scripts/test*; do
+       # remove cruft from prior test
+       if test $PRESERVE = yes ; then
+               /bin/rm -rf testrun/db.*
+       else
+               /bin/rm -rf testrun
+       fi
+
        echo ">>>>> Starting ${TB}`basename $CMD`${TN} ..."
-       $CMD $SRCDIR $BACKEND $SYNCREPL
+       $CMD
        RC=$?
        if test $RC -eq 0 ; then
                echo ">>>>> $CMD completed ${TB}OK${TN}."
@@ -51,6 +24,7 @@ for CMD in $SRCDIR/scripts/test*; do
                echo ">>>>> $CMD ${TB}failed${TN} (exit $RC)"
                exit $RC
        fi
+
        echo ">>>>> waiting 10 seconds for things to exit"
        sleep 10
        echo ""