Fix startup, use explicit serverIDs from the beginning

[openldap] / tests / scripts / all

diff --git a/tests/scripts/all b/tests/scripts/all
index 8d111d2c71ecf2fb4b587785b1c70756059cee42..e05bba09ab92773dd9b521a49e170c149a79c2b3 100755 (executable)
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -1,25 +1,44 @@
-#!/bin/sh
+#! /bin/sh
+# $OpenLDAP$
+## 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>.
 
-echo ">>>>> Executing all LDAP tests..."
+SHTOOL="$SRCDIR/../build/shtool"
+TB=`$SHTOOL echo -e "%B"`
+TN=`$SHTOOL echo -e "%b"`
+SLEEPTIME=10
 
-if [ $# -eq 0 ]; then
-       SCRIPTDIR="."
-else
-       SCRIPTDIR=$1; shift
-fi
+echo ">>>>> Executing all LDAP tests for $BACKEND"
 
-for i in $SCRIPTDIR/test*; do
-       CMD=$i $*
-       echo ">>>>> Starting $CMD ..."
+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
        RC=$?
-       if [ $RC -eq 0 ]; then
-               echo ">>>>> $CMD completed OK."
+       if test $RC -eq 0 ; then
+               echo ">>>>> $CMD completed ${TB}OK${TN}."
        else
-               echo ">>>>> $CMD failed (exit $RC)"
+               echo ">>>>> $CMD ${TB}failed${TN} (exit $RC)"
                exit $RC
        fi
-       echo ">>>>> waiting 5 seconds for things to exit"
-       sleep 5
-       echo
+
+#      echo ">>>>> waiting $SLEEPTIME seconds for things to exit"
+#      sleep $SLEEPTIME
+       echo ""
 done