X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest036-meta-concurrency;h=26063ed901f00164fe027c245348b23ecb97dfe2;hb=fc1396fa2e94ee2e752fd7c3ea5bb22f6592398a;hp=6ef14eb8caa60963c2053e5b4fefff52d45ccb59;hpb=da6d9eb0463255782f3fa70c61fd958d94c048cf;p=openldap
diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency
index 6ef14eb8ca..26063ed901 100755
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@@ -2,7 +2,7 @@
# $OpenLDAP$
## This work is part of OpenLDAP Software .
##
-## Copyright 1998-2007 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
@@ -23,22 +23,19 @@ if test $BACKMETA = metano ; then
exit 0
fi
-#### No longer experimental, IMHO
-###if test "x$TEST_META" = "xno" ; then
-### echo '### Test disabled by "TEST_META=no"; unset TEST_META to re-enable'
-### echo ""
-### exit 0
-###else
-### echo "### this test is experimental; in case of problems,"
-### echo "### set \"TEST_META=no\" to disable, and report thru"
-### echo "### the Issue Tracking System "
-### echo ""
-###fi
+if test $BACKLDAP = ldapno ; then
+ echo "ldap backend not available, test skipped"
+ exit 0
+fi
if test x$TESTLOOPS = x ; then
TESTLOOPS=50
fi
+if test x$TESTCHILDREN = x ; then
+ TESTCHILDREN=20
+fi
+
rm -rf $TESTDIR
mkdir -p $TESTDIR $DBDIR1 $DBDIR2
@@ -60,7 +57,7 @@ if test "$BACKEND" = "bdb" || test "$BACKEND" = "hdb" ; then
fi
echo "Starting slapd on TCP/IP port $PORT1..."
-. $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
+. $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
PID=$!
if test $WAIT != 0 ; then
@@ -196,10 +193,16 @@ for f in $TESTDIR/$DATADIR/do_bind.* ; do
echo "" >> $f
done
+# fix test data to include back-monitor, if available
+# NOTE: copies do_* files from $TESTDIR/$DATADIR to $TESTDIR
+$MONITORDATA "$MONITORDB" "$TESTDIR/$DATADIR" "$TESTDIR"
+
+BINDDN="cn=Manager,o=Local"
+PASSWD="secret"
echo "Using tester for concurrent server access..."
-$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR/$DATADIR" -h $LOCALHOST -p $PORT3 \
- -D "cn=Manager,$METABASEDN" -w $PASSWD -l $TESTLOOPS -r 20 -FF \
- -i '!REFERRAL'
+$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT3 \
+ -D "$BINDDN" -w $PASSWD -l $TESTLOOPS -j $TESTCHILDREN \
+ -r 20 -i '!REFERRAL' -i '*INVALID_CREDENTIALS' -SS
RC=$?
if test $RC != 0 ; then
@@ -221,9 +224,9 @@ if test $RC != 0 ; then
fi
echo "Filtering ldapsearch results..."
-. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Filtering original ldif used to create database..."
-. $LDIFFILTER < $METACONCURRENCYOUT > $LDIFFLT
+$LDIFFILTER < $METACONCURRENCYOUT > $LDIFFLT
echo "Comparing filter output..."
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT