Merge remote branch 'origin/mdb.master'

[openldap] / tests / scripts / sql-test001-concurrency

diff --git a/tests/scripts/sql-test001-concurrency b/tests/scripts/sql-test001-concurrency
index e3ab4fb1e114d33b7eb2afc8a8c4ba063aebf2da..a09bbc52268df6569aba5d3e55e6b55150f9ecfd 100755 (executable)
--- a/tests/scripts/sql-test001-concurrency
+++ b/tests/scripts/sql-test001-concurrency
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2008 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -26,8 +26,8 @@ if test $RDBMS = "rdbmsno" ; then
        exit 0
 fi
 
-if test "x$LOOPS" = "x" ; then
-       LOOPS=5
+if test "x$TESTLOOPS" = "x" ; then
+       TESTLOOPS=5
 fi
 
 if test "x$CHILDREN" = "x" ; then
@@ -79,7 +79,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Filtering original ldif used to create database..."
-. $LDIFFILTER < $SEARCHOUT > $LDIFFLT
+$LDIFFILTER < $SEARCHOUT > $LDIFFLT
 
 if test "${RDBMSWRITE}" != "yes"; then
        echo "write test disabled for ${RDBMS}; set SLAPD_USE_SQLWRITE=yes to enable"
@@ -102,7 +102,7 @@ fi
 echo "Using tester for concurrent server access..."
 $SLAPDTESTER -P "$PROGDIR" -d "$SQLDATADIR" \
        -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD \
-       -l $LOOPS $CHILDREN -FF
+       -l $TESTLOOPS $CHILDREN -FF
 RC=$?
 
 if test $RC != 0 ; then
@@ -124,7 +124,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Filtering ldapsearch results..."
-. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
 echo "Comparing filter output..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT