ITS#5189

[openldap] / tests / scripts / all

diff --git a/tests/scripts/all b/tests/scripts/all
index 1e4a4d1da27b0a5955a3d2f09022285fe028a70d..3e8c80886f41cc0dd16b531fdd71389086144e80 100755 (executable)
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -1,49 +1,40 @@
 #! /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
-       BACKENDTYPE=yes
-else
-       BACKENDTYPE=$1; shift
-fi
-
-echo ">>>>> Backend Type: $BACKENDTYPE"
-
-if test $# -eq 0 ; then
-       MONITOR=no
-else
-       MONITOR=$1; shift
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2007 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>.
+
+. $SRCDIR/scripts/defines.sh
+
+TB="" TN=""
+if test -t 1 ; then
+       TB=`$SHTOOL echo -e "%B" 2>/dev/null`
+       TN=`$SHTOOL echo -e "%b" 2>/dev/null`
 fi
 
-SHTOOL="$SRCDIR/../build/shtool"
+SLEEPTIME=10
 
-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 $TESTDIR/db.*
+       else
+               /bin/rm -rf $TESTDIR
+       fi
+
        echo ">>>>> Starting ${TB}`basename $CMD`${TN} ..."
-       $CMD $SRCDIR $BACKEND $BACKENDTYPE $MONITOR
+       $CMD
        RC=$?
        if test $RC -eq 0 ; then
                echo ">>>>> $CMD completed ${TB}OK${TN}."
@@ -51,7 +42,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