Fix prev commit, better test for multiple URI matches

[openldap] / tests / scripts / all

diff --git a/tests/scripts/all b/tests/scripts/all
index 0b48a448297028aad407d47f7ac2323d40dd7125..851c0d20c7d36912b1e28f959c36ee3166386dc8 100755 (executable)
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -1,37 +1,44 @@
 #! /bin/sh
+# $OpenLDAP$
+## 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>.
 
-# disable LDAP initialization
-LDAPNOINIT=true; export LDAPNOINIT
+SHTOOL="$SRCDIR/../build/shtool"
+TB=`$SHTOOL echo -e "%B"`
+TN=`$SHTOOL echo -e "%b"`
+SLEEPTIME=10
 
-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=ldbm
-else
-       BACKEND=$1; shift
-fi
-
-echo ">>>>> Backend: $BACKEND"
+echo ">>>>> Executing all LDAP tests for $BACKEND"
 
 for CMD in $SRCDIR/scripts/test*; do
-       echo ">>>>> Starting `basename $CMD` ..."
-       $CMD $SRCDIR $BACKEND
+       # 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
        RC=$?
        if test $RC -eq 0 ; then
-               echo ">>>>> $CMD completed OK."
+               echo ">>>>> $CMD completed ${TB}OK${TN}."
        else
-               echo ">>>>> $CMD failed (exit $RC)"
+               echo ">>>>> $CMD ${TB}failed${TN} (exit $RC)"
                exit $RC
        fi
-       echo ">>>>> waiting 10 seconds for things to exit"
-       sleep 10
-       echo
+
+#      echo ">>>>> waiting $SLEEPTIME seconds for things to exit"
+#      sleep $SLEEPTIME
+       echo ""
 done