From HEAD

[openldap] / tests / scripts / all

diff --git a/tests/scripts/all b/tests/scripts/all
index 85cb1a0edbec5bf4746e99e2abbf94b17c8cfb12..111b55968500e09ecd3207bf4a33f9a0d6cbd38b 100755 (executable)
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -1,41 +1,35 @@
 #! /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"
-
-if test $# -eq 0 ; then
-       MONITOR=no
-else
-       MONITOR=$1; shift
-fi
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2006 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 
 SHTOOL="$SRCDIR/../build/shtool"
-
 TB=`$SHTOOL echo -e "%B"`
 TN=`$SHTOOL echo -e "%b"`
+SLEEPTIME=10
+
+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 $MONITOR
+       $CMD
        RC=$?
        if test $RC -eq 0 ; then
                echo ">>>>> $CMD completed ${TB}OK${TN}."
@@ -43,7 +37,8 @@ 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 ">>>>> waiting $SLEEPTIME seconds for things to exit"
+       sleep $SLEEPTIME
        echo ""
 done