ITS#5189

[openldap] / tests / scripts / all

diff --git a/tests/scripts/all b/tests/scripts/all
index 1028b5f466522430bf88b14001227e6471ea0a0e..3e8c80886f41cc0dd16b531fdd71389086144e80 100755 (executable)
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -1,16 +1,37 @@
 #! /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>.
 
-SHTOOL="$SRCDIR/../build/shtool"
-TB=`$SHTOOL echo -e "%B"`
-TN=`$SHTOOL echo -e "%b"`
+. $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
+
+SLEEPTIME=10
 
 echo ">>>>> Executing all LDAP tests for $BACKEND"
 
 for CMD in $SRCDIR/scripts/test*; do
        # remove cruft from prior test
-       /bin/rm -rf test-db test-db1 test-db2
-       /bin/rm -rf test-repl test-repl1 test-repl2
+       if test $PRESERVE = yes ; then
+               /bin/rm -rf $TESTDIR/db.*
+       else
+               /bin/rm -rf $TESTDIR
+       fi
 
        echo ">>>>> Starting ${TB}`basename $CMD`${TN} ..."
        $CMD
@@ -22,7 +43,7 @@ for CMD in $SRCDIR/scripts/test*; do
                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