add monitor testing to concurrency tests data

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 88900d78a658242f822069f38251cd35e19b3ecf..6f77c0c5bf7538a5d6d4280ba27bd75eb549b74e 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -163,6 +163,8 @@ TOOLPROTO="-P 3"
 LDIFFILTER=$SRCDIR/scripts/acfilter.sh
 CONFFILTER=$SRCDIR/scripts/conf.sh
 
+MONITORDATA=$SRCDIR/scripts/monitor_data.sh
+
 SLAPADD="$TESTWD/../servers/slapd/slapd -Ta -d 0 $LDAP_VERBOSE"
 SLAPCAT="$TESTWD/../servers/slapd/slapd -Tc -d 0 $LDAP_VERBOSE"
 SLAPINDEX="$TESTWD/../servers/slapd/slapd -Ti -d 0 $LDAP_VERBOSE"

diff --git a/tests/scripts/monitor_data.sh b/tests/scripts/monitor_data.sh
index d27dbd9976f0f06fec89660814b499a7f747fe55..9eef239d6a24432d8d6bd0ca5af3044e453f1945 100755 (executable)
--- a/tests/scripts/monitor_data.sh
+++ b/tests/scripts/monitor_data.sh
@@ -14,20 +14,20 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 MONITORDB="$1"
-DATADIR="$2"
-TESTDIR="$3"
+SRCDIR="$2"
+DSTDIR="$3"
 
 echo "MONITORDB $MONITORDB"
-echo "DATADIR $DATADIR"
-echo "TESTDIR $TESTDIR"
+echo "SRCDIR $SRCDIR"
+echo "DSTDIR $DSTDIR"
 echo "pwd `pwd`"
 
 # copy test data
-cp "$DATADIR"/do_* "$TESTDIR"
+cp "$SRCDIR"/do_* "$DSTDIR"
 if test $MONITORDB != no ; then
 
-       # add back-monitor testing
-       cat >> "$TESTDIR/do_search.0" << EOF
+       # add back-monitor testing data
+       cat >> "$DSTDIR/do_search.0" << EOF
 cn=Monitor
 (objectClass=*)
 cn=Monitor
@@ -38,10 +38,11 @@ cn=Monitor
 (objectClass=*)
 EOF
 
-       cat >> "$TESTDIR/do_read.0" << EOF
+       cat >> "$DSTDIR/do_read.0" << EOF
 cn=Backend 1,cn=Backends,cn=Monitor
 cn=Entries,cn=Statistics,cn=Monitor
 cn=Database 1,cn=Databases,cn=Monitor
 EOF
 
 fi
+

diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index 689e5b21567e00aab6bf4f137ebcfdcef1009bbe..0b1654e1d9e301643c4d437b07f884ada827cc76 100755 (executable)
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -54,9 +54,13 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 
+# fix test data to include back-monitor, if available
+# NOTE: copies do_* files from $DATADIR to $TESTDIR
+$MONITORDATA "$MONITORDB" "$DATADIR" "$TESTDIR"
+
 echo "Using tester for concurrent server access..."
-time $SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l $LOOPS
-#$SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50
+time $SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l $LOOPS
+#$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l $LOOPS
 RC=$?
 
 if test $RC != 0 ; then

diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency
index a42c99d35ed2e32173a78672c3f68360a858d787..8f95c7eb894c4f4c0bbda5371efd194bf841fc9c 100755 (executable)
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@@ -189,8 +189,12 @@ 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 \
+$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT3 \
        -D "cn=Manager,$METABASEDN" -w $PASSWD -l $TESTLOOPS -r 20 -FF \
        -i '!REFERRAL'
 RC=$?

diff --git a/tests/scripts/test039-glue-ldap-concurrency b/tests/scripts/test039-glue-ldap-concurrency
index 53a9bb1feca9f2e6fb6eed94588f121595c81c6e..f1038b3eab66e5cab8ae24234fe619eea84a6868 100755 (executable)
--- a/tests/scripts/test039-glue-ldap-concurrency
+++ b/tests/scripts/test039-glue-ldap-concurrency
@@ -177,8 +177,12 @@ 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 \
+$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT3 \
        -D "cn=Manager,$METABASEDN" -w $PASSWD \
        -l $TESTLOOPS -L $TESTOLOOPS -r 20 -FF \
        -i '!REFERRAL'