For ITS#5810: Use progs/ldif-filter. Retire scripts/acfilter.sh.

[openldap] / tests / scripts / test036-meta-concurrency

diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency
index 06d39820f20ce539bfc33536a4112726c3048c58..b4f5ed1e8406a2638faf16d31f88f253e92d3561 100755 (executable)
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2006 The OpenLDAP Foundation.
+## Copyright 1998-2009 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -23,17 +23,10 @@ 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 <http://www.openldap.org/its/>"
-###    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
@@ -60,7 +53,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 +189,14 @@ 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"
+
 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 "cn=Manager,$METABASEDN" -w $PASSWD -l $TESTLOOPS -r 20 \
+       -i '!REFERRAL' -i '*INVALID_CREDENTIALS'
 RC=$?
 
 if test $RC != 0 ; then
@@ -221,9 +218,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