X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Fall;h=b9b90821f4a697af04883e0de2b890878dfbde93;hb=a2405e0a7e31a128774b3e4077c1199d3a3cdf5e;hp=8f209abb4519fcaff14771934fc10411527b20f9;hpb=6680465d020db8058d053fc5615922d7bec251a2;p=openldap

diff --git a/tests/scripts/all b/tests/scripts/all
index 8f209abb45..b9b90821f4 100755
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2003 The OpenLDAP Foundation.
+## Copyright 1998-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -13,18 +13,19 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-SHTOOL="$SRCDIR/../build/shtool"
+. $SRCDIR/scripts/defines.sh
 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.*
+		/bin/rm -rf $TESTDIR/db.*
 	else
-		/bin/rm -rf testrun
+		/bin/rm -rf $TESTDIR
 	fi
 
 	echo ">>>>> Starting ${TB}`basename $CMD`${TN} ..."
@@ -37,7 +38,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