Sync with HEAD

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

diff --git a/tests/scripts/sql-test001-concurrency b/tests/scripts/sql-test001-concurrency
index 49507241c5055bcc7387b0b0cd4dca98caef01e0..f5e6655495ed865a4052fe455314ae7d71a74425 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-2004 The OpenLDAP Foundation.
+## Copyright 1998-2006 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@ if test $RDBMS = "rdbmsno" ; then
 fi
 
 SQLDATADIR=$TESTDIR/sql-concurrency
-mkdir -p $SQLDATADIR
+mkdir -p $TESTDIR $SQLDATADIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SQLCONF > $CONF1
@@ -82,6 +82,7 @@ else
                cp $SQLCONCURRENCYDIR/do_* $SQLDATADIR
                ;;
        *)
+               echo "write is not supported for ${RDBMS}; performing read-only concurrency test"
                cp $SQLCONCURRENCYDIR/do_read* $SQLCONCURRENCYDIR/do_search* \
                        $SQLDATADIR
                ;;
@@ -89,7 +90,7 @@ else
 fi
 
 echo "Using tester for concurrent server access..."
-$SLAPDTESTER -P "$PROGDIR" -d "$DATADIR/sql-concurrency" \
+$SLAPDTESTER -P "$PROGDIR" -d "$SQLDATADIR" \
        -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 5 -j 4
 RC=$?