Issue#9333 - Delete unused TIMING variable left over from OpenLDAP 2.0

diff --git a/tests/data/regressions/its4184/its4184 b/tests/data/regressions/its4184/its4184
index 4170f05cb03f1f663b59f3e9c39768847add15bb..3a58d5079b5437033e3f94012921589dfe644f3b 100755 (executable)
--- a/tests/data/regressions/its4184/its4184
+++ b/tests/data/regressions/its4184/its4184
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/data/regressions/its4326/its4326 b/tests/data/regressions/its4326/its4326
index 5118d51a821c01ff79bae1729f04e3e037b08438..514230ee3f5d1d3552c59cd5c857698df8f0410f 100755 (executable)
--- a/tests/data/regressions/its4326/its4326
+++ b/tests/data/regressions/its4326/its4326
@@ -41,7 +41,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 SERVERPID=$!
 if test $WAIT != 0 ; then
     echo SERVERPID $SERVERPID
@@ -71,7 +71,7 @@ fi
 
 echo "Starting proxy slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PROXYPID=$!
 if test $WAIT != 0 ; then
     echo PROXYPID $PROXYPID
@@ -167,7 +167,7 @@ case $RC in
 esac
 
 echo "Restarting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 SERVERPID=$!
 if test $WAIT != 0 ; then
     echo SERVERPID $SERVERPID

diff --git a/tests/data/regressions/its4336/its4336 b/tests/data/regressions/its4336/its4336
index ee40ab66316d09de19684588bbd0095c780703e2..9edca07ad182a67e01b9e0ce03aec823e2f3901a 100755 (executable)
--- a/tests/data/regressions/its4336/its4336
+++ b/tests/data/regressions/its4336/its4336
@@ -46,7 +46,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 SERVERPID=$!
 if test $WAIT != 0 ; then
     echo SERVERPID $SERVERPID
@@ -76,7 +76,7 @@ fi
 
 echo "Starting chain slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PROXYPID=$!
 if test $WAIT != 0 ; then
     echo PROXYPID $PROXYPID

diff --git a/tests/data/regressions/its4448/its4448 b/tests/data/regressions/its4448/its4448
index 9319374451660cf460938c2a10bccae5ee2b595e..37a603228f0ac34218bd9ed7d53acd6314b8f03f 100755 (executable)
--- a/tests/data/regressions/its4448/its4448
+++ b/tests/data/regressions/its4448/its4448
@@ -49,7 +49,7 @@ ITSCONF=$ITSDIR/slapd-meta.conf
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -105,7 +105,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -144,7 +144,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSCONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/data/regressions/its6794/its6794 b/tests/data/regressions/its6794/its6794
index d27e85e47c2d54b606869715623d974a4272358b..d82a791c7391a18470911d371ee7c44ae868667b 100755 (executable)
--- a/tests/data/regressions/its6794/its6794
+++ b/tests/data/regressions/its6794/its6794
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/data/regressions/its7573/its7573 b/tests/data/regressions/its7573/its7573
index 5e5a1119c1f231e490748e7654f406f6f028b5ac..daeba59ca4a21ffe96c4a4a96a84221ed967ee35 100755 (executable)
--- a/tests/data/regressions/its7573/its7573
+++ b/tests/data/regressions/its7573/its7573
@@ -34,7 +34,7 @@ echo "Starting slapd on TCP/IP port $PORT1... $PWD"
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CONFDIR -n 0 -l $CONFLDIF
 cd $TESTDIR
-$SLAPD -F ./slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/data/regressions/its8427/its8427 b/tests/data/regressions/its8427/its8427
index 41874763a3fd6990a956b5f8a75787d39c3fd5c5..39fa5b36492c445d3bbe2b557ecf14cdf53ba9ab 100755 (executable)
--- a/tests/data/regressions/its8427/its8427
+++ b/tests/data/regressions/its8427/its8427
@@ -139,7 +139,7 @@ olcOverlay: syncprov
 EOF
 
 echo "Starting provider..."
-$SLAPD -F ./slapd.d -h "$SURIP1 ldaps://127.0.0.2:$PORT1" -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F ./slapd.d -h "$SURIP1 ldaps://127.0.0.2:$PORT1" -d $LVL > $LOG1 2>&1 &
 MASTERPID=$!
 if test $WAIT != 0 ; then
     echo MASTERPID $MASTERPID
@@ -181,7 +181,7 @@ olcSyncRepl: rid=001 provider=ldaps://127.0.0.2:$PORT1
 EOF
 
 echo "Starting consumer..."
-$SLAPD -F ./slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F ./slapd.d -h $URI2 -d $LVL > $LOG2 2>&1 &
 SLAVEPID=$!
 if test $WAIT != 0 ; then
     echo SLAVEPID $SLAVEPID
@@ -252,7 +252,7 @@ sleep $SLEEP2
 
 echo "======================= RESTART =======================" >> $LOG1
 cd $TESTDIR/srv1
-$SLAPD -F slapd.d -h "$SURIP1 ldaps://127.0.0.2:$PORT1" -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -F slapd.d -h "$SURIP1 ldaps://127.0.0.2:$PORT1" -d $LVL >> $LOG1 2>&1 &
 MASTERPID=$!
 if test $WAIT != 0 ; then
     echo MASTERPID $MASTERPID

diff --git a/tests/data/regressions/its8427/its8427-2 b/tests/data/regressions/its8427/its8427-2
index 5e34da562b38e0d6ed9e013ec3f48db0c1ebc782..e12207d813d4e79755c03d3074baeb5b76d908f2 100755 (executable)
--- a/tests/data/regressions/its8427/its8427-2
+++ b/tests/data/regressions/its8427/its8427-2
@@ -53,7 +53,7 @@ echo "database config" >> $CONF1
 echo "include $TESTDIR/configpw.conf" >> $CONF1
 
 echo "Starting slapd listening on $URIP1 and $SURIP2..."
-$SLAPD -f $CONF1 -h "$URIP1 $SURIP2" -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h "$URIP1 $SURIP2" -d $LVL > $LOG1 2>&1 &
 SERVERPID=$!
 if test $WAIT != 0 ; then
     echo SERVERPID $SERVERPID
@@ -86,7 +86,7 @@ echo "include $TESTDIR/configpw.conf" >> $CONF2
 
 echo "Starting proxy slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF2
-$SLAPD -f $CONF2 -h $URI3 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI3 -d $LVL > $LOG2 2>&1 &
 PROXYPID=$!
 if test $WAIT != 0 ; then
     echo PROXYPID $PROXYPID

diff --git a/tests/data/regressions/its8444/its8444 b/tests/data/regressions/its8444/its8444
index c722ad6ec5c0b3fb5fdd7e5b28fbcb2563e4e497..dacb30873547343af00a7c9870bc3f37e665bccb 100755 (executable)
--- a/tests/data/regressions/its8444/its8444
+++ b/tests/data/regressions/its8444/its8444
@@ -72,7 +72,7 @@ while [ $n -le $MPR ]; do
        CFDIR=${XDIR}$n/slapd.d
 
        echo "Starting provider slapd on TCP/IP URI $MYURI"
-       $SLAPD -F $CFDIR -h $MYURI -d $LVL $TIMING > $MYLOG 2>&1 &
+       $SLAPD -F $CFDIR -h $MYURI -d $LVL > $MYLOG 2>&1 &
 
        PID=$!
        if test $WAIT != 0 ; then

diff --git a/tests/data/regressions/its8521/its8521 b/tests/data/regressions/its8521/its8521
index 149e91b1cec7f03c6a6bdd2fa31661c787f6e712..e6dc7d7ed4406eee84c1844884f81f58648b4698 100755 (executable)
--- a/tests/data/regressions/its8521/its8521
+++ b/tests/data/regressions/its8521/its8521
@@ -47,7 +47,7 @@ ITSDIR=$DATADIR/regressions/its$ITS
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
-$SLAPD -F $CFPRO -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
        echo PID $PID
@@ -78,7 +78,7 @@ fi
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-consumer.ldif > $CONFLDIF
 $SLAPADD -F $CFCON -n 0 -l $CONFLDIF
-$SLAPD -F $CFCON -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F $CFCON -h $URI2 -d $LVL > $LOG2 2>&1 &
 SLAVEPID=$!
 if test $WAIT != 0 ; then
        echo SLAVEPID $SLAVEPID

diff --git a/tests/data/regressions/its8616/its8616 b/tests/data/regressions/its8616/its8616
index fa92ed7dea3544b46980a257ede0c5d1da527c57..44ca347bd488dce3bf25442a2db7a94d7ae57511 100755 (executable)
--- a/tests/data/regressions/its8616/its8616
+++ b/tests/data/regressions/its8616/its8616
@@ -40,7 +40,7 @@ ITSDIR=$DATADIR/regressions/its$ITS
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
-$SLAPD -F $CFPRO -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
        echo PID $PID

diff --git a/tests/data/regressions/its8663/its8663 b/tests/data/regressions/its8663/its8663
index eb4db57e3a07ad21633cd6e83fa790572124d9ca..d6f0150f22c98fc66ea6df38e855c811b201a80d 100755 (executable)
--- a/tests/data/regressions/its8663/its8663
+++ b/tests/data/regressions/its8663/its8663
@@ -40,7 +40,7 @@ ITSDIR=$DATADIR/regressions/its$ITS
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd-provider.ldif > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
-$SLAPD -F $CFPRO -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
        echo PID $PID

diff --git a/tests/data/regressions/its8752/its8752 b/tests/data/regressions/its8752/its8752
index cff3d84bc86ef92f51ec2b1f674aefb761280dc8..63317303c4f29a1b95edd8168807446d3dccae63 100755 (executable)
--- a/tests/data/regressions/its8752/its8752
+++ b/tests/data/regressions/its8752/its8752
@@ -69,7 +69,7 @@ KILLPIDS=
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $ITSDIR/slapd.conf > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
        echo PID $PID
@@ -182,7 +182,7 @@ while [ $n -le $MPR ]; do
        if [ -f $TESTDIR/slapd.conf ]; then
                rm -f $TESTDIR/slapd.conf
        fi
-       $SLAPD -f $MYCONF -h $MYURI  -d $LVL $TIMING >> $MYLOG 2>&1 &
+       $SLAPD -f $MYCONF -h $MYURI  -d $LVL >> $MYLOG 2>&1 &
        PID=$!
        if test $WAIT != 0 ; then
                echo PID $PID
@@ -400,7 +400,7 @@ while [ $n -le $MPR ]; do
     if [ -f $TESTDIR/slapd.conf ]; then
         rm -f $TESTDIR/slapd.conf
     fi
-    $SLAPD -f $MYCONF -h $MYURI  -d $LVL $TIMING >> $MYLOG 2>&1 &
+    $SLAPD -f $MYCONF -h $MYURI  -d $LVL >> $MYLOG 2>&1 &
     PID=$!
     if test $WAIT != 0 ; then
         echo PID $PID

diff --git a/tests/data/regressions/its8800/its8800 b/tests/data/regressions/its8800/its8800
index 99a5dca1bf88b53bfb63eacc459e01cda8beb183..7a312b6e2301932708782c2717d922d4d821a85f 100755 (executable)
--- a/tests/data/regressions/its8800/its8800
+++ b/tests/data/regressions/its8800/its8800
@@ -70,7 +70,7 @@ while [ $n -le $MPR ]; do
        CFDIR=${XDIR}$n/slapd.d
 
        echo "Starting provider slapd on TCP/IP URI $MYURI"
-       $SLAPD -F $CFDIR -h $MYURI -d $LVL $TIMING > $MYLOG 2>&1 &
+       $SLAPD -F $CFDIR -h $MYURI -d $LVL > $MYLOG 2>&1 &
 
        PID=$!
        if test $WAIT != 0 ; then
@@ -146,7 +146,7 @@ echo "done"
 
 echo "Starting provider1 slapd on TCP/IP URI $URI1"
 CFDIR="$TESTDIR/srv1/slapd.d"
-$SLAPD -F $CFDIR -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -F $CFDIR -h $URI1 -d $LVL >> $LOG1 2>&1 &
 
 PID=$!
 if test $WAIT != 0 ; then

diff --git a/tests/data/regressions/its9282/its9282 b/tests/data/regressions/its9282/its9282
index 366df1cb0d295756f8c4145903fbeb07a82e0baa..6572095f4812ecdb9bc0ea4e101fb221cffe75b0 100755 (executable)
--- a/tests/data/regressions/its9282/its9282
+++ b/tests/data/regressions/its9282/its9282
@@ -67,7 +67,7 @@ while [ $n -le $MMR ]; do
        CFDIR=${XDIR}$n/slapd.d
 
        echo "Starting provider slapd on TCP/IP URI $MYURI"
-       $SLAPD -F $CFDIR -h $MYURI -d $LVL -d sync $TIMING > $MYLOG 2>&1 &
+       $SLAPD -F $CFDIR -h $MYURI -d $LVL -d sync > $MYLOG 2>&1 &
 
        PID=$!
        if test $WAIT != 0 ; then
@@ -181,7 +181,7 @@ $LDAPSEARCH -D $MANAGERDN -w $PASSWD -b "$BASEDN" -H $URI2 \
 
 echo "Starting provider1 slapd on TCP/IP URI $URI1"
 CFDIR="$TESTDIR/srv1/slapd.d"
-$SLAPD -F $CFDIR -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -F $CFDIR -h $URI1 -d $LVL >> $LOG1 2>&1 &
 
 PID=$!
 if test $WAIT != 0 ; then

diff --git a/tests/scripts/passwd-search b/tests/scripts/passwd-search
index bc9be744a70537ba7b45df6592e29dbdffaaab5a..171462965d8e08e268439f3df926e51e3aa2add1 100755 (executable)
--- a/tests/scripts/passwd-search
+++ b/tests/scripts/passwd-search
@@ -33,7 +33,7 @@ mkdir -p $TESTDIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $PASSWDCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test ${WAIT-0} != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/relay b/tests/scripts/relay
index ceb82f7f373e5ba251a7035418fcc350f0e16f16..99b74aef689b2a905f25a00b245f667294290b64 100755 (executable)
--- a/tests/scripts/relay
+++ b/tests/scripts/relay
@@ -19,7 +19,7 @@ echo ""
 echo "Starting slapd on TCP/IP port $PORT1..."
 echo "======== Starting slapd with $RELAY backend ========" >> $LOG1
 . $CONFFILTER $BACKEND $MONITORDB < $RELAYCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/sql-test000-read b/tests/scripts/sql-test000-read
index 62363a9d6bf3f5aea2c844db3b6e78b2851c2bea..56a83defc468ed773b5edd2ee02ee36960f7df28 100755 (executable)
--- a/tests/scripts/sql-test000-read
+++ b/tests/scripts/sql-test000-read
@@ -30,7 +30,7 @@ mkdir -p $TESTDIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SQLCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/sql-test001-concurrency b/tests/scripts/sql-test001-concurrency
index e6c09b68c14774a0294a55deccec78ab49ac9128..ac00a395977db8d933f8bfe66a195a5b6e823c61 100755 (executable)
--- a/tests/scripts/sql-test001-concurrency
+++ b/tests/scripts/sql-test001-concurrency
@@ -41,7 +41,7 @@ mkdir -p $TESTDIR $SQLDATADIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SQLCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/sql-test900-write b/tests/scripts/sql-test900-write
index fbe93385bb640c924b7d294a77806bb9045b0440..c208dd0c221c211d5f208e8c783de94703aea805 100755 (executable)
--- a/tests/scripts/sql-test900-write
+++ b/tests/scripts/sql-test900-write
@@ -35,7 +35,7 @@ mkdir -p $TESTDIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SQLCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/sql-test901-syncrepl b/tests/scripts/sql-test901-syncrepl
index 66b2adcf8bac53172b6a767532ca5d7b2ae6736a..b61a4cc117904af791d490af4f5457c54182f25c 100755 (executable)
--- a/tests/scripts/sql-test901-syncrepl
+++ b/tests/scripts/sql-test901-syncrepl
@@ -35,7 +35,7 @@ mkdir -p $TESTDIR $DBDIR2A
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SQLSRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -63,7 +63,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $R1SRCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID

diff --git a/tests/scripts/start-server b/tests/scripts/start-server
index dd16de5517acbe24d6c3d92b870df1541ca216e0..aab53469dc0429fb497a85146560996c530d1445 100755 (executable)
--- a/tests/scripts/start-server
+++ b/tests/scripts/start-server
@@ -29,7 +29,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."

diff --git a/tests/scripts/start-server-nolog b/tests/scripts/start-server-nolog
index a367581ccc082cd138d14cea9a29aef8a999814b..91209d17556a6571c6500b20b94fac5459a6c93e 100755 (executable)
--- a/tests/scripts/start-server-nolog
+++ b/tests/scripts/start-server-nolog
@@ -29,7 +29,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> /dev/null 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> /dev/null 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."

diff --git a/tests/scripts/start-server2 b/tests/scripts/start-server2
index 5c728d0f93376fa850329fa6106035259d202f0d..8353693434095308933ca1de4a3d1b5805282c5a 100755 (executable)
--- a/tests/scripts/start-server2
+++ b/tests/scripts/start-server2
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND < $CONFTWO > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."

diff --git a/tests/scripts/start-server2-nolog b/tests/scripts/start-server2-nolog
index f95f94ee4475e5fc481b7bc08467fa9cb6e54ea3..5cea5f3d2ec3abe39200b228424095e1ffe35781 100755 (executable)
--- a/tests/scripts/start-server2-nolog
+++ b/tests/scripts/start-server2-nolog
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND < $CONFTWO > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > /dev/null 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > /dev/null 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."

diff --git a/tests/scripts/startup_nis_ldap_server.sh b/tests/scripts/startup_nis_ldap_server.sh
index e531b00ebd9c9c3ef1b32cdb83b3e4d27290efee..151440daafceb3d7269ab6284473a70cb0d3c0a8 100755 (executable)
--- a/tests/scripts/startup_nis_ldap_server.sh
+++ b/tests/scripts/startup_nis_ldap_server.sh
@@ -47,7 +47,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $NIS_CONF -p $PORT -d $LVL $TIMING > $PROVIDERLOG 2>&1 &
+$SLAPD -f $NIS_CONF -p $PORT -d $LVL > $PROVIDERLOG 2>&1 &
 PID=$!
 
 echo ">>>>> LDAP server with NIS schema is up! PID=$PID"

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index a461a4b4961be559606482c4eb82fc5f791cbddc..f17e7fd54961fd60904e82084f07de7c86662581 100755 (executable)
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 5df7404964dbf40cb5dc14d5a41492c1110eddbc..1684ca39bb50791024fee5e0cb5ba16fce20f276 100755 (executable)
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -29,7 +29,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -93,7 +93,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 4fbace8128bbe2cddc1b031c13a95edeb86ed841..52afea51cf4c422291bc535d4304d7a25e9b4f2e 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 9454fd71042f83e1623d72b5c37c6fff948faa43..7bd2a2818a86381f9d64731fcdfb74a5d435d5a4 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -37,7 +37,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 573ba07044b731d2b154e5c301caf1f9b9f4cb55..9d472de864002446ff4594b4762d857f0b4f00e8 100755 (executable)
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -28,7 +28,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 694fc3b1ff4154e6d4fcd5d8e7429f2ed907b516..95421bfbc4730f18760ec1e18325f66c0bf8ef91 100755 (executable)
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -28,7 +28,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index 8fdb6e8d18d5f86f9a52c0fda1901f8f40d1e6a0..f0cf563ae6290faa0557138747d6767f379cac47 100755 (executable)
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test007-slapmodify b/tests/scripts/test007-slapmodify
index a34ca59d2d20a7d2691df7dfd2d53110a831b9cf..377e5a4a06fd77f4a1ca2919c616fa085b4f2eb7 100755 (executable)
--- a/tests/scripts/test007-slapmodify
+++ b/tests/scripts/test007-slapmodify
@@ -37,7 +37,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index eb49638dd078205f1f7a09f21bdbf9102bebe514..b14cd9f542ba2dbcd3dd8f08db898dab1df0d0ce 100755 (executable)
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@@ -32,7 +32,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index 7f0de605d1e3ca4239245e5786731a497133faee..73754b4dd6c38a34eb4ea1928486e5bdde8ccf27 100755 (executable)
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -32,7 +32,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
-$SLAPD -n provider -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -n provider -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -41,7 +41,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $REFCONSUMERCONF > $CONF2
-$SLAPD -n consumer -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -n consumer -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID

diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd
index 9c9b8712cc60881cdfb465b6c7737b0dfc167036..b0cc28f0819025f4481d94823aadda1dcf790bc6 100755 (executable)
--- a/tests/scripts/test010-passwd
+++ b/tests/scripts/test010-passwd
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $PWCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test011-glue-slapadd b/tests/scripts/test011-glue-slapadd
index 8a288166d60c86c2b3ff978c4ee6a1bea54c6141..682ed933d3f8945630cb3adcb4118297ed0a1ccb 100755 (executable)
--- a/tests/scripts/test011-glue-slapadd
+++ b/tests/scripts/test011-glue-slapadd
@@ -28,7 +28,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test012-glue-populate b/tests/scripts/test012-glue-populate
index a8d5d3dbf2a1da7337e53c657e6c640278bbf60d..d587bbd509d65b5d96e34dd836eb2e9808ffab4e 100755 (executable)
--- a/tests/scripts/test012-glue-populate
+++ b/tests/scripts/test012-glue-populate
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1A $DBDIR1B $DBDIR1C
 
 echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $GLUECONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test013-language b/tests/scripts/test013-language
index b06e1a620f7ff382dee2920fb8108c7b92c4c437..d017b77430b259124d9cf83dd2b26cf1cebe101d 100755 (executable)
--- a/tests/scripts/test013-language
+++ b/tests/scripts/test013-language
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test014-whoami b/tests/scripts/test014-whoami
index 07fd2022751d89ea5175e3a0f8ac7574a3f3ae95..8912d3f7cf76e3bcc6d130a8ff3ba4868ed9f1a4 100755 (executable)
--- a/tests/scripts/test014-whoami
+++ b/tests/scripts/test014-whoami
@@ -29,7 +29,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $WHOAMICONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch
index 634bb60a77e906b940417b78a08d0c46e1aff8b1..34acbebc7e849abbe111b89246c44152338aa6a8 100755 (executable)
--- a/tests/scripts/test015-xsearch
+++ b/tests/scripts/test015-xsearch
@@ -37,7 +37,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref
index 67649860593e88b1c6d660320894c781512a6db1..faba05a81f28014e5b9b9c4ca04cd59417f33e7d 100755 (executable)
--- a/tests/scripts/test016-subref
+++ b/tests/scripts/test016-subref
@@ -31,7 +31,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh
index 4416b3e5eb0adc34980f3587d23f9c2d66c2b58a..8c6d7b3f63195e444186a9d56ff1dab10c0729ba 100755 (executable)
--- a/tests/scripts/test017-syncreplication-refresh
+++ b/tests/scripts/test017-syncreplication-refresh
@@ -35,7 +35,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -75,7 +75,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $R1SRCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID

diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index b4227245330b590d940eebdc8c77c2c979f17df6..74d5ee236b73717d54ac457badb0ca303c24b784 100755 (executable)
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -37,7 +37,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -77,7 +77,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT4..."
 . $CONFFILTER $BACKEND $MONITORDB < $P1SRCONSUMERCONF > $CONF4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL > $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -159,7 +159,7 @@ kill -HUP "$PID"
 wait $PID
 sleep 10
 echo "RESTART" >> $LOG1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -413,7 +413,7 @@ fi
 
 echo "Restarting consumer..."
 echo "RESTART" >> $LOG4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL >> $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID

diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade
index 0a0e131f4bd30ffff145292cc006a909246381af..8dab8e79221e80bee4064f2be1db5f91409e6b47 100755 (executable)
--- a/tests/scripts/test019-syncreplication-cascade
+++ b/tests/scripts/test019-syncreplication-cascade
@@ -34,7 +34,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR3 $DBDIR4 $DBDIR5 $DBDIR6
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -74,7 +74,7 @@ fi
 
 echo "Starting R1 consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $R1SRCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMER R1 PID $CONSUMERPID
@@ -104,7 +104,7 @@ fi
 
 echo "Starting R2 consumer slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $R2SRCONSUMERCONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMER R2 PID $CONSUMERPID
@@ -134,7 +134,7 @@ fi
 
 echo "Starting P1 consumer slapd on TCP/IP port $PORT4..."
 . $CONFFILTER $BACKEND $MONITORDB < $P1SRCONSUMERCONF > $CONF4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL > $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMER P1 PID $CONSUMERPID
@@ -164,7 +164,7 @@ fi
 
 echo "Starting P2 consumer slapd on TCP/IP port $PORT5..."
 . $CONFFILTER $BACKEND $MONITORDB < $P2SRCONSUMERCONF > $CONF5
-$SLAPD -f $CONF5 -h $URI5 -d $LVL $TIMING > $LOG5 2>&1 &
+$SLAPD -f $CONF5 -h $URI5 -d $LVL > $LOG5 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMER P2 PID $CONSUMERPID
@@ -194,7 +194,7 @@ fi
 
 echo "Starting P3 consumer slapd on TCP/IP port $PORT6..."
 . $CONFFILTER $BACKEND $MONITORDB < $P3SRCONSUMERCONF > $CONF6
-$SLAPD -f $CONF6 -h $URI6 -d $LVL $TIMING > $LOG6 2>&1 &
+$SLAPD -f $CONF6 -h $URI6 -d $LVL > $LOG6 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMER P3 PID $CONSUMERPID

diff --git a/tests/scripts/test021-certificate b/tests/scripts/test021-certificate
index 417fc9842233025c4417118aba2b07b13970c5eb..3f1589b7a35b4bee5bec247bbe8c7a472cb706b0 100755 (executable)
--- a/tests/scripts/test021-certificate
+++ b/tests/scripts/test021-certificate
@@ -29,8 +29,8 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-#valgrind -v --gdb-attach=yes --logfile=info --num-callers=16 --leak-check=yes --leak-resolution=high $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING </dev/tty > $LOG1 2>&1 &
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+#valgrind -v --gdb-attach=yes --logfile=info --num-callers=16 --leak-check=yes --leak-resolution=high $SLAPD -f $CONF1 -h $URI1 -d $LVL </dev/tty > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test022-ppolicy b/tests/scripts/test022-ppolicy
index 6e8eae024c8388adc4ac3a64e84ca1870ee6cfe1..7d536b5bc5fdba1b2b3b561058dcb7a36f658a52 100755 (executable)
--- a/tests/scripts/test022-ppolicy
+++ b/tests/scripts/test022-ppolicy
@@ -28,7 +28,7 @@ echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $PPOLICYCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -531,7 +531,7 @@ echo "Setting up policy state forwarding test..."
 mkdir $DBDIR2
 sed -e "s,$DBDIR1,$DBDIR2," < $CONF1 > $CONF2
 echo "Starting slapd consumer on TCP/IP port $PORT2..."
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test023-refint b/tests/scripts/test023-refint
index 3e3614f5c22264dc476fd908cfc95fb140f4feff..938049680d3aeb67496456e6e5bf5c07ec9043c4 100755 (executable)
--- a/tests/scripts/test023-refint
+++ b/tests/scripts/test023-refint
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test024-unique b/tests/scripts/test024-unique
index d6bc8fe6067607d4afb5b0a78ae89db0b462beca..8ca1be6b256f99bce5736f16ceac135b03cb5bd2 100755 (executable)
--- a/tests/scripts/test024-unique
+++ b/tests/scripts/test024-unique
@@ -41,7 +41,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 mkdir $TESTDIR/confdir
-$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test025-limits b/tests/scripts/test025-limits
index 551b969a1173b7aad506a33d15ded5afecd65e49..36c0e4b0b0dde46ebdddcbe3f97dfb8c46b9e212 100755 (executable)
--- a/tests/scripts/test025-limits
+++ b/tests/scripts/test025-limits
@@ -44,7 +44,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test026-dn b/tests/scripts/test026-dn
index add6f5baa90806515ba11955049b268a4d5ddff8..25930be337150397de48cf00c72514c49b6a7210 100755 (executable)
--- a/tests/scripts/test026-dn
+++ b/tests/scripts/test026-dn
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 . $CONFFILTER $BACKEND $MONITORDB < $DNCONF > $CONF1
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test027-emptydn b/tests/scripts/test027-emptydn
index 866144668578ba2cb9b79c62495206dba11a78f0..8ac6637268f3dbca264b4df47d8012ac17001ed9 100755 (executable)
--- a/tests/scripts/test027-emptydn
+++ b/tests/scripts/test027-emptydn
@@ -36,7 +36,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -98,7 +98,7 @@ echo "Cleaning up database directories..."
 mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test028-idassert b/tests/scripts/test028-idassert
index ba5e32bba3472392f64860250d4d7f73b0cb0807..5673b6711a49dbfb0f6d59384620273d092efefe 100755 (executable)
--- a/tests/scripts/test028-idassert
+++ b/tests/scripts/test028-idassert
@@ -66,7 +66,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $IDASSERTCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test029-ldapglue b/tests/scripts/test029-ldapglue
index f33984433e458ca9a3aa025644f0123348aba8e6..cd15c2a4795002f2ec4401e6734ee2afabd221f0 100755 (executable)
--- a/tests/scripts/test029-ldapglue
+++ b/tests/scripts/test029-ldapglue
@@ -71,7 +71,7 @@ fi
 
 echo "Starting local slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $LDAPGLUECONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID1=$!
 if test $WAIT != 0 ; then
     echo PID $PID1
@@ -80,7 +80,7 @@ fi
 
 echo "Starting remote slapd 1 on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $LDAPGLUECONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID2=$!
 if test $WAIT != 0 ; then
     echo PID $PID2
@@ -89,7 +89,7 @@ fi
 
 echo "Starting remote slapd 2 on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $LDAPGLUECONF3 > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID3=$!
 if test $WAIT != 0 ; then
     echo PID $PID3

diff --git a/tests/scripts/test031-component-filter b/tests/scripts/test031-component-filter
index 3984008a961765c34fef819acead5c0c7c51ce70..f06ee4e206689a72dc3d2a28f7a470996322152f 100755 (executable)
--- a/tests/scripts/test031-component-filter
+++ b/tests/scripts/test031-component-filter
@@ -52,7 +52,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $ADDCONF -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $ADDCONF -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test032-chain b/tests/scripts/test032-chain
index becaec0e1ed541b42cea2f9fc1c6a7e4f864ab07..f6d613ef71d4569f6a8b373905ce905554ad9039 100755 (executable)
--- a/tests/scripts/test032-chain
+++ b/tests/scripts/test032-chain
@@ -46,7 +46,7 @@ fi
 
 echo "Starting first slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CHAINCONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID1=$!
 if test $WAIT != 0 ; then
     echo PID $PID1
@@ -56,7 +56,7 @@ KILLPIDS="$PID1"
 
 echo "Starting second slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $CHAINCONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID2=$!
 if test $WAIT != 0 ; then
     echo PID $PID2

diff --git a/tests/scripts/test033-glue-syncrepl b/tests/scripts/test033-glue-syncrepl
index c7dc769802e4c73a0139e10dd8b1e7520ef31d67..ab3b4c37ae1d2ec1aaa53e6660828febfc0bbcef 100755 (executable)
--- a/tests/scripts/test033-glue-syncrepl
+++ b/tests/scripts/test033-glue-syncrepl
@@ -37,7 +37,7 @@ cp -pr $DBDIR1C $DBDIR2C
 
 echo "Starting slapd 1 on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $GLUESYNCCONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -61,7 +61,7 @@ done
 
 echo "Starting slapd 2 on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $GLUESYNCCONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test034-translucent b/tests/scripts/test034-translucent
index d5e333f69cad0829f6954bad4e2dfc5ba9e26179..7c69a267de76e7ff059050f87b152ee2090f30aa 100755 (executable)
--- a/tests/scripts/test034-translucent
+++ b/tests/scripts/test034-translucent
@@ -52,7 +52,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting remote slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -86,7 +86,7 @@ mkdir -p $DBDIR2
 . $CONFFILTER $BACKEND $MONITORDB < $TRANSLUCENTLOCALCONF > $CONF2
 
 echo "Starting local slapd on TCP/IP port $PORT2..."
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test035-meta b/tests/scripts/test035-meta
index c13ede77682fa74b5717eecfe1947d6ce948139f..087749acfce8fe38e661545098fdd20c6f272cef 100755 (executable)
--- a/tests/scripts/test035-meta
+++ b/tests/scripts/test035-meta
@@ -34,7 +34,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -73,7 +73,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -112,7 +112,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency
index 3344f45fb7b58c5e60311432d803b21b4303b4ba..693aeca9d1443a1b62d94ce14ef45117efe9d3e1 100755 (executable)
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@@ -42,7 +42,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -81,7 +81,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -120,7 +120,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test037-manage b/tests/scripts/test037-manage
index 42171d9ee872946277ac21c695c42f6c2d30c57b..3da9f97915b88b1bcd35ccabd7c23c04cbce234d 100755 (executable)
--- a/tests/scripts/test037-manage
+++ b/tests/scripts/test037-manage
@@ -33,7 +33,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test038-retcode b/tests/scripts/test038-retcode
index 9a8d2625f282e7521987c3c9808e51cc8b1ccc3c..7582cde8226bbba1662b9351d738a9c32209a516 100755 (executable)
--- a/tests/scripts/test038-retcode
+++ b/tests/scripts/test038-retcode
@@ -42,7 +42,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test039-glue-ldap-concurrency b/tests/scripts/test039-glue-ldap-concurrency
index d11d1bd5f3c8636a37d3c038e3b4333f63997340..59f2f55ae3f96386a950a2a22acab2824e6e6d03 100755 (executable)
--- a/tests/scripts/test039-glue-ldap-concurrency
+++ b/tests/scripts/test039-glue-ldap-concurrency
@@ -46,7 +46,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -85,7 +85,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -124,7 +124,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $GLUELDAPCONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test040-subtree-rename b/tests/scripts/test040-subtree-rename
index f1057d6545944ddd3e4b3f793501abb7040884f5..7984af3d32bcb48b05aff41d761ad4d06c8033af 100755 (executable)
--- a/tests/scripts/test040-subtree-rename
+++ b/tests/scripts/test040-subtree-rename
@@ -20,7 +20,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test041-aci b/tests/scripts/test041-aci
index b7ff0bac949fae8e97d1ffb2f02380e09eccc7ee..b90534e1f65ce9776aaac8a36cfa57f2ec8d91f5 100755 (executable)
--- a/tests/scripts/test041-aci
+++ b/tests/scripts/test041-aci
@@ -39,7 +39,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test042-valsort b/tests/scripts/test042-valsort
index 7026a5731b946bc4f72b5fb79335a6f5ff516697..f626a0cf10225b63169bd573cba713568a3890dd 100755 (executable)
--- a/tests/scripts/test042-valsort
+++ b/tests/scripts/test042-valsort
@@ -36,7 +36,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test043-delta-syncrepl b/tests/scripts/test043-delta-syncrepl
index 29222141005d4e3b608ba5fd6d4ac535f57fe7b3..9597ee9c8dc8a7b3ded32baf38166fe6385c0eef 100755 (executable)
--- a/tests/scripts/test043-delta-syncrepl
+++ b/tests/scripts/test043-delta-syncrepl
@@ -46,7 +46,7 @@ SPEC="mdb=a"
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $DSRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -86,7 +86,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $DSRCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -131,7 +131,7 @@ echo "Stopping the provider, sleeping 10 seconds and restarting it..."
 kill -HUP "$PID"
 sleep 10
 echo "RESTART" >> $LOG1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -321,7 +321,7 @@ EOMODS
 
 echo "Restarting consumer..."
 echo "RESTART" >> $LOG2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL >> $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID

diff --git a/tests/scripts/test044-dynlist b/tests/scripts/test044-dynlist
index 07ff6868a4161b4bf0d8fe69823cd3a15662965b..5ef8bbc2bd95aafd7d19ddc619d28e2317ab46ee 100755 (executable)
--- a/tests/scripts/test044-dynlist
+++ b/tests/scripts/test044-dynlist
@@ -48,7 +48,7 @@ fi
 
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied
index b932fc3dee3671d010b0e1c5cd26c9f09c2b7677..0f70488fb180eb90de72bea524e64ac3b433781b 100755 (executable)
--- a/tests/scripts/test045-syncreplication-proxied
+++ b/tests/scripts/test045-syncreplication-proxied
@@ -52,7 +52,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PROVIDERPID=$!
 if test $WAIT != 0 ; then
     echo PROVIDERPID $PROVIDERPID
@@ -92,7 +92,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $RCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -122,7 +122,7 @@ fi
 
 echo "Starting proxy slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $PLSRCONSUMERCONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PROXYPID=$!
 if test $WAIT != 0 ; then
     echo PROXYPID $PROXYPID
@@ -246,7 +246,7 @@ wait $PROVIDERPID
 sleep $SLEEP2
 
 echo "======================= RESTART =======================" >> $LOG1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PROVIDERPID=$!
 if test $WAIT != 0 ; then
     echo PROVIDERPID $PROVIDERPID
@@ -460,7 +460,7 @@ EOMODS
 
 echo "Restarting proxy..."
 echo "======================= RESTART =======================" >> $LOG3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL >> $LOG3 2>&1 &
 PROXYPID=$!
 if test $WAIT != 0 ; then
     echo PROXYPID $PROXYPID
@@ -645,7 +645,7 @@ sleep $SLEEP2
 
 echo "Restarting consumer..."
 echo "======================= RESTART =======================" >> $LOG2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL >> $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -731,7 +731,7 @@ if test $? != 0 ; then
 
        echo "  ${CHECK}.1 > Restarting proxy..."
        echo "======================= RESTART =======================" >> $LOG3
-       $SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+       $SLAPD -f $CONF3 -h $URI3 -d $LVL >> $LOG3 2>&1 &
        PROXYPID=$!
        if test $WAIT != 0 ; then
                echo PROXYPID $PROXYPID

diff --git a/tests/scripts/test046-dds b/tests/scripts/test046-dds
index 5534cfe620391db7678e0ac74470038d6f7fa2b2..25d637ce7ba943168906dd6b6bbab935ec45bdbc 100755 (executable)
--- a/tests/scripts/test046-dds
+++ b/tests/scripts/test046-dds
@@ -48,7 +48,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test047-ldap b/tests/scripts/test047-ldap
index 196f992db92eea7a5fb1e4d295c3200997e1e7b4..5c9b741a04d080b85a93edba2f3c7c9d4ff23d42 100755 (executable)
--- a/tests/scripts/test047-ldap
+++ b/tests/scripts/test047-ldap
@@ -34,7 +34,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -73,7 +73,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -112,7 +112,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $GLUELDAPCONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test048-syncrepl-multiproxy b/tests/scripts/test048-syncrepl-multiproxy
index 61378e1df2fe629237ef2c186aba3a8118b8c694..1d76eb8dbaa9ab434ceae15bb8d4f11d88835e8b 100755 (executable)
--- a/tests/scripts/test048-syncrepl-multiproxy
+++ b/tests/scripts/test048-syncrepl-multiproxy
@@ -45,7 +45,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR3
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $PLSRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PROVIDERPID=$!
 if test $WAIT != 0 ; then
     echo PROVIDERPID $PROVIDERPID
@@ -85,7 +85,7 @@ fi
 
 echo "Starting P1 consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $RCONSUMERCONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 P1CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo P1CONSUMERPID $P1CONSUMERPID
@@ -115,7 +115,7 @@ fi
 
 echo "Starting R1 consumer slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $RCONSUMERCONF | sed -e 's;\.2\.\([^/]*\)$;.3.\1;' > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 R1CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo R1CONSUMERPID $R1CONSUMERPID
@@ -223,7 +223,7 @@ wait $PROVIDERPID
 sleep $SLEEP2
 
 echo "======================= RESTART =======================" >> $LOG1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PROVIDERPID=$!
 if test $WAIT != 0 ; then
     echo PROVIDERPID $PROVIDERPID
@@ -432,7 +432,7 @@ EOMODS
 
 echo "Restarting P1 consumer..."
 echo "======================= RESTART =======================" >> $LOG3
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL >> $LOG2 2>&1 &
 P1CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo P1CONSUMERPID $P1CONSUMERPID
@@ -441,7 +441,7 @@ fi
 
 echo "Restarting R1 consumer..."
 echo "======================= RESTART =======================" >> $LOG3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL >> $LOG3 2>&1 &
 R1CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo R1CONSUMERPID $R1CONSUMERPID

diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config
index 440f2c3e13acdea54fe98cc6288639e5251894d4..cc1fbdbf8831627e8c88af6457223885bb8ad7e6 100755 (executable)
--- a/tests/scripts/test049-sync-config
+++ b/tests/scripts/test049-sync-config
@@ -62,7 +62,7 @@ echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
 cd $PRODIR
-$SLAPD -F ./slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -135,7 +135,7 @@ fi
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 $SLAPADD -F $CFCON -n 0 -l $CONFLDIF
 cd $CONDIR
-$SLAPD -F ./slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F ./slapd.d -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID

diff --git a/tests/scripts/test050-syncrepl-multiprovider b/tests/scripts/test050-syncrepl-multiprovider
index c22205e21f9e9f81b164b20d9f3bb857bc3dddf7..4b6b6f3125a993dca4d960a40f6b666ea388a9b6 100755 (executable)
--- a/tests/scripts/test050-syncrepl-multiprovider
+++ b/tests/scripts/test050-syncrepl-multiprovider
@@ -85,7 +85,7 @@ done
 
 echo "Starting server 1 on TCP/IP port $PORT1..."
 cd ${XDIR}1
-$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -186,7 +186,7 @@ URI="ldap://${LOCALHOST}:$PORT/"
 LOG=$TESTDIR/slapd.$n.log
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}$n
-$SLAPD -F ./slapd.d -h $URI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F ./slapd.d -h $URI -d $LVL > $LOG 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -642,7 +642,7 @@ KILLPIDS=""
 echo "Starting server 1 on TCP/IP port $PORT1..."
 echo "======================= RESTART =======================" >> $LOG1
 cd ${XDIR}1
-$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -F slapd.d -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -679,7 +679,7 @@ LOG=$TESTDIR/slapd.$n.log
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}$n
 echo "======================= RESTART =======================" >> $LOG
-$SLAPD -F ./slapd.d -h $URI -d $LVL $TIMING >> $LOG 2>&1 &
+$SLAPD -F ./slapd.d -h $URI -d $LVL >> $LOG 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test051-config-undo b/tests/scripts/test051-config-undo
index 65d9264583e8d0f2e09cdad66f4e2cb39ab2b8c3..d2c168d593ecbe308a598840bc50a1dcc7ce6b29 100755 (executable)
--- a/tests/scripts/test051-config-undo
+++ b/tests/scripts/test051-config-undo
@@ -37,7 +37,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 mkdir $TESTDIR/confdir
-$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test052-memberof b/tests/scripts/test052-memberof
index 7fe3df2250b5a92129571f2405351291592af5ef..5de145bbfd429e756c4df76e20e0779c66eca815 100755 (executable)
--- a/tests/scripts/test052-memberof
+++ b/tests/scripts/test052-memberof
@@ -28,7 +28,7 @@ echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $NAKEDCONF > $CONF1
-$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test053-syncprov-glue b/tests/scripts/test053-syncprov-glue
index f1e2a81c93608511360314328115e52da1baa006..55d0e0e295bb8d856742242cc2d981f3ce9547bc 100755 (executable)
--- a/tests/scripts/test053-syncprov-glue
+++ b/tests/scripts/test053-syncprov-glue
@@ -101,7 +101,7 @@ EOF
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 cd $PRODDIR
-$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -129,7 +129,7 @@ fi
 
 echo "Starting provider2 slapd on TCP/IP port $PORT2..."
 cd $PRO2DIR
-$SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F slapd.d -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -157,7 +157,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT3..."
 cd $CONSDIR
-$SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -F slapd.d -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test054-syncreplication-parallel-load b/tests/scripts/test054-syncreplication-parallel-load
index 6188cab735d31e20530bedd53b9d52fb78546ccf..1efb20b4e8500895ebfb8e84ff0adae4183d6e0e 100755 (executable)
--- a/tests/scripts/test054-syncreplication-parallel-load
+++ b/tests/scripts/test054-syncreplication-parallel-load
@@ -35,7 +35,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4
 
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRPROVIDERCONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -75,7 +75,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT4..."
 . $CONFFILTER $BACKEND $MONITORDB < $P1SRCONSUMERCONF > $CONF4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL > $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -128,7 +128,7 @@ kill -HUP "$PID"
 wait $PID
 sleep 10
 echo "RESTART" >> $LOG1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL >> $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -285,7 +285,7 @@ EOMODS
 
 echo "Restarting consumer..."
 echo "RESTART" >> $LOG4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL >> $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID

diff --git a/tests/scripts/test055-valregex b/tests/scripts/test055-valregex
index 7ba745f60adfcd4a71f6ab1d6dec7d32e7ebc28c..c4a8104601dbc4c033dfb7726cc820a962251ed2 100755 (executable)
--- a/tests/scripts/test055-valregex
+++ b/tests/scripts/test055-valregex
@@ -29,7 +29,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test056-monitor b/tests/scripts/test056-monitor
index 0e1ba20a6b4d649665cf271e5579b5e7636dcd08..9727cf4b72ffd1e33d9cb48ba82134b3f567710b 100755 (executable)
--- a/tests/scripts/test056-monitor
+++ b/tests/scripts/test056-monitor
@@ -25,7 +25,7 @@ mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test057-memberof-refint b/tests/scripts/test057-memberof-refint
index 75e3e4b8701c4fa2004dbbb2d2b30703f9d50755..6be95d3f9c288a6fc2939e22076b6fc94fab153e 100755 (executable)
--- a/tests/scripts/test057-memberof-refint
+++ b/tests/scripts/test057-memberof-refint
@@ -34,7 +34,7 @@ echo "rootpw `$SLAPPASSWD -T $CONFIGPWF`" >$TESTDIR/configpw.conf
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $NAKEDCONF > $CONF1
-$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -F $TESTDIR/confdir -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test058-syncrepl-asymmetric b/tests/scripts/test058-syncrepl-asymmetric
index 5af83d1f07aa3c290bad190f83910efe83b31ad2..f8734dc297f93866773065581600120833d9ff34 100755 (executable)
--- a/tests/scripts/test058-syncrepl-asymmetric
+++ b/tests/scripts/test058-syncrepl-asymmetric
@@ -195,7 +195,7 @@ done
 
 echo "Starting central provider slapd on TCP/IP port $PORT1..."
 cd $SMC_DIR
-$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 SMC_PID=$!
 if test $WAIT != 0 ; then
        echo PID $SMC_PID
@@ -221,7 +221,7 @@ fi
 
 echo "Starting site1 provider slapd on TCP/IP port $PORT2..."
 cd $SM1_DIR
-$SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F slapd.d -h $URI2 -d $LVL > $LOG2 2>&1 &
 SM1_PID=$!
 if test $WAIT != 0 ; then
        echo PID $SM1_PID
@@ -247,7 +247,7 @@ fi
 
 echo "Starting site2 provider slapd on TCP/IP port $PORT3..."
 cd $SM2_DIR
-$SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -F slapd.d -h $URI3 -d $LVL > $LOG3 2>&1 &
 SM2_PID=$!
 if test $WAIT != 0 ; then
        echo PID $SM2_PID
@@ -273,7 +273,7 @@ fi
 
 echo "Starting central search slapd on TCP/IP port $PORT4..."
 cd $SSC_DIR
-$SLAPD -F slapd.d -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 &
+$SLAPD -F slapd.d -h $URI4 -d $LVL > $LOG4 2>&1 &
 SSC_PID=$!
 if test $WAIT != 0 ; then
        echo PID $SSC_PID
@@ -300,7 +300,7 @@ fi
 
 echo "Starting site1 search slapd on TCP/IP port $PORT5..."
 cd $SS1_DIR
-$SLAPD -F slapd.d -h $URI5 -d $LVL $TIMING > $LOG5 2>&1 &
+$SLAPD -F slapd.d -h $URI5 -d $LVL > $LOG5 2>&1 &
 SS1_PID=$!
 if test $WAIT != 0 ; then
        echo PID $SS1_PID
@@ -327,7 +327,7 @@ fi
 
 echo "Starting site2 search slapd on TCP/IP port $PORT6..."
 cd $SS2_DIR
-$SLAPD -F slapd.d -h $URI6 -d $LVL $TIMING > $LOG6 2>&1 &
+$SLAPD -F slapd.d -h $URI6 -d $LVL > $LOG6 2>&1 &
 SS2_PID=$!
 if test $WAIT != 0 ; then
        echo PID $SS2_PID
@@ -1007,7 +1007,7 @@ fi
 if test -z "$SM1_PID" ; then
        echo "Restarting site1 provider slapd on TCP/IP port $PORT2..."
        cd $SM1_DIR
-       $SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+       $SLAPD -F slapd.d -h $URI2 -d $LVL >> $LOG2 2>&1 &
        SM1_PID=$!
        if test $WAIT != 0 ; then
            echo PID $SM1_PID
@@ -1286,7 +1286,7 @@ if test $CSN_ERRORS != 0 ; then
 
        echo "Restarting site1 provider slapd on TCP/IP port $PORT2..."
        cd $SM1_DIR
-       $SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+       $SLAPD -F slapd.d -h $URI2 -d $LVL >> $LOG2 2>&1 &
        SM1_PID=$!
        if test $WAIT != 0 ; then
                echo PID $SM1_PID
@@ -1312,7 +1312,7 @@ if test $CSN_ERRORS != 0 ; then
 
        echo "Restarting site2 provider slapd on TCP/IP port $PORT3..."
        cd $SM2_DIR
-       $SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+       $SLAPD -F slapd.d -h $URI3 -d $LVL >> $LOG3 2>&1 &
        SM2_PID=$!
        if test $WAIT != 0 ; then
                echo PID $SM2_PID
@@ -1338,7 +1338,7 @@ if test $CSN_ERRORS != 0 ; then
 
        echo "Restarting central provider slapd on TCP/IP port $PORT1..."
        cd $SMC_DIR
-       $SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+       $SLAPD -F slapd.d -h $URI1 -d $LVL >> $LOG1 2>&1 &
        SMC_PID=$!
        if test $WAIT != 0 ; then
                echo PID $SMC_PID
@@ -1372,7 +1372,7 @@ if test $CSN_ERRORS != 0 ; then
 
        echo "Restarting site1 provider slapd on TCP/IP port $PORT2..."
        cd $SM1_DIR
-       $SLAPD -F slapd.d -h $URI2 -d $LVL $TIMING >> $LOG2 2>&1 &
+       $SLAPD -F slapd.d -h $URI2 -d $LVL >> $LOG2 2>&1 &
        SM1_PID=$!
        if test $WAIT != 0 ; then
                echo PID $SM1_PID
@@ -1398,7 +1398,7 @@ if test $CSN_ERRORS != 0 ; then
 
        echo "Restarting site2 provider slapd on TCP/IP port $PORT3..."
        cd $SM2_DIR
-       $SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+       $SLAPD -F slapd.d -h $URI3 -d $LVL >> $LOG3 2>&1 &
        SM2_PID=$!
        if test $WAIT != 0 ; then
                echo PID $SM2_PID
@@ -1427,7 +1427,7 @@ if test $CSN_ERRORS != 0 ; then
 
        echo "Restarting central search slapd on TCP/IP port $PORT4..."
        cd $SSC_DIR
-       $SLAPD -F slapd.d -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 &
+       $SLAPD -F slapd.d -h $URI4 -d $LVL >> $LOG4 2>&1 &
        SSC_PID=$!
        if test $WAIT != 0 ; then
                echo PID $SSC_PID
@@ -1453,7 +1453,7 @@ if test $CSN_ERRORS != 0 ; then
 
        echo "Restarting site1 search slapd on TCP/IP port $PORT5..."
        cd $SS1_DIR
-       $SLAPD -F slapd.d -h $URI5 -d $LVL $TIMING >> $LOG5 2>&1 &
+       $SLAPD -F slapd.d -h $URI5 -d $LVL >> $LOG5 2>&1 &
        SS1_PID=$!
        if test $WAIT != 0 ; then
                echo PID $SS1_PID
@@ -1479,7 +1479,7 @@ if test $CSN_ERRORS != 0 ; then
 
        echo "Restarting site2 search slapd on TCP/IP port $PORT6..."
        cd $SS2_DIR
-       $SLAPD -F slapd.d -h $URI6 -d $LVL $TIMING >> $LOG6 2>&1 &
+       $SLAPD -F slapd.d -h $URI6 -d $LVL >> $LOG6 2>&1 &
        SS2_PID=$!
        if test $WAIT != 0 ; then
                echo PID $SS2_PID
@@ -2041,7 +2041,7 @@ rm -rf $SS2_DIR/db/*
 
 echo "Starting site2 provider slapd on TCP/IP port $PORT3..."
 cd $SM2_DIR
-$SLAPD -F slapd.d -h $URI3 -d $LVL $TIMING >> $LOG3 2>&1 &
+$SLAPD -F slapd.d -h $URI3 -d $LVL >> $LOG3 2>&1 &
 SM2_PID=$!
 if test $WAIT != 0 ; then
        echo PID $SM2_PID
@@ -2067,7 +2067,7 @@ fi
 
 echo "Starting site2 search slapd on TCP/IP port $PORT6..."
 cd $SS2_DIR
-$SLAPD -F slapd.d -h $URI6 -d $LVL $TIMING >> $LOG6 2>&1 &
+$SLAPD -F slapd.d -h $URI6 -d $LVL >> $LOG6 2>&1 &
 SS2_PID=$!
 if test $WAIT != 0 ; then
        echo PID $SS2_PID
@@ -2093,7 +2093,7 @@ fi
 
 echo "Starting central provider slapd on TCP/IP port $PORT1..."
 cd $SMC_DIR
-$SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+$SLAPD -F slapd.d -h $URI1 -d $LVL >> $LOG1 2>&1 &
 SMC_PID=$!
 if test $WAIT != 0 ; then
        echo PID $SMC_PID
@@ -2211,7 +2211,7 @@ if test $RC != 0 ; then
        KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $SMC_PID / /"`;
 
        cd $SMC_DIR
-       $SLAPD -F slapd.d -h $URI1 -c rid=4,csn=0 -d $LVL $TIMING >> $LOG1 2>&1 &
+       $SLAPD -F slapd.d -h $URI1 -c rid=4,csn=0 -d $LVL >> $LOG1 2>&1 &
        SMC_PID=$!
        if test $WAIT != 0 ; then
                echo PID $SMC_PID
@@ -2277,7 +2277,7 @@ if test $RC != 0 ; then
        KILLPIDS=`echo "$KILLPIDS " | sed -e "s/ $SSC_PID / /"`;
 
        cd $SSC_DIR
-       $SLAPD -F slapd.d -h $URI4 -c rid=1,csn=0 -d $LVL $TIMING >> $LOG4 2>&1 &
+       $SLAPD -F slapd.d -h $URI4 -c rid=1,csn=0 -d $LVL >> $LOG4 2>&1 &
        SSC_PID=$!
        if test $WAIT != 0 ; then
                echo PID $SSC_PID
@@ -2364,7 +2364,7 @@ EOF
 
        echo "Starting central provider again..."
        cd $SMC_DIR
-       $SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+       $SLAPD -F slapd.d -h $URI1 -d $LVL >> $LOG1 2>&1 &
        SMC_PID=$!
        KILLPIDS="$KILLPIDS $SMC_PID"
        cd $TESTWD
@@ -2410,7 +2410,7 @@ EOF
 
        echo "Starting central provider again..."
        cd $SMC_DIR
-       $SLAPD -F slapd.d -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
+       $SLAPD -F slapd.d -h $URI1 -d $LVL >> $LOG1 2>&1 &
        SMC_PID=$!
        KILLPIDS="$KILLPIDS $SMC_PID"
        cd $TESTWD

diff --git a/tests/scripts/test059-consumer-config b/tests/scripts/test059-consumer-config
index 3a1bd6003e7e03e5c715c1e81971a5a9152b4502..328f92e2685cef99d37aacb48cd8a1aea01402e0 100755 (executable)
--- a/tests/scripts/test059-consumer-config
+++ b/tests/scripts/test059-consumer-config
@@ -57,7 +57,7 @@ esac
 echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
-$SLAPD -F $CFPRO -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CFPRO -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -187,7 +187,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 $SLAPADD -F $CFCON -n 0 -l $CONFLDIF
-$SLAPD -F $CFCON -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -F $CFCON -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID

diff --git a/tests/scripts/test060-mt-hot b/tests/scripts/test060-mt-hot
index 8443ffb49357ff4645d00ca962e6be1fb14f507d..c8beab01de46a32e4576f527bcffbd6e3875b763 100755 (executable)
--- a/tests/scripts/test060-mt-hot
+++ b/tests/scripts/test060-mt-hot
@@ -56,8 +56,8 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-echo $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+echo $SLAPD -f $CONF1 -h $URI1 -d $LVL
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test061-syncreplication-initiation b/tests/scripts/test061-syncreplication-initiation
index a8f10768338380f8c07e0e2cf4e544d19aa62fde..76f96ff79a110b210b5869564719221fa14e6715 100755 (executable)
--- a/tests/scripts/test061-syncreplication-initiation
+++ b/tests/scripts/test061-syncreplication-initiation
@@ -86,7 +86,7 @@ done
 
 echo "Starting provider slapd on $PROV_URI"
 cd $PROV_DIR
-$SLAPD -F slapd.d -h $PROV_URI -d $LVL $TIMING >> $PROV_LOG 2>&1 &
+$SLAPD -F slapd.d -h $PROV_URI -d $LVL >> $PROV_LOG 2>&1 &
 PROV_PID=$!
 if test $WAIT != 0 ; then
        echo PID $PROV_PID
@@ -111,7 +111,7 @@ fi
 
 echo "Starting forward1 slapd on $FWD1_URI"
 cd $FWD1_DIR
-$SLAPD -F slapd.d -h $FWD1_URI -d $LVL $TIMING >> $FWD1_LOG 2>&1 &
+$SLAPD -F slapd.d -h $FWD1_URI -d $LVL >> $FWD1_LOG 2>&1 &
 FWD1_PID=$!
 if test $WAIT != 0 ; then
        echo PID $FWD1_PID
@@ -136,7 +136,7 @@ fi
 
 echo "Starting consumer slapd on $CONS_URI"
 cd $CONS_DIR
-$SLAPD -F slapd.d -h $CONS_URI -d $LVL $TIMING >> $CONS_LOG 2>&1 &
+$SLAPD -F slapd.d -h $CONS_URI -d $LVL >> $CONS_LOG 2>&1 &
 CONS_PID=$!
 if test $WAIT != 0 ; then
        echo PID $CONS_PID
@@ -374,7 +374,7 @@ EOF
 
        echo "Starting forwarders again"
        cd $FWD1_DIR
-       $SLAPD -F slapd.d -h $FWD1_URI -d $LVL $TIMING >> $FWD1_LOG 2>&1 &
+       $SLAPD -F slapd.d -h $FWD1_URI -d $LVL >> $FWD1_LOG 2>&1 &
        FWD1_PID=$!
        KILLPIDS="$KILLPIDS $FWD1_PID"
        cd $TESTWD
@@ -470,7 +470,7 @@ EOF
 
        echo "Starting forwarders again"
        cd $FWD1_DIR
-       $SLAPD -F slapd.d -h $FWD1_URI -d $LVL $TIMING >> $FWD1_LOG 2>&1 &
+       $SLAPD -F slapd.d -h $FWD1_URI -d $LVL >> $FWD1_LOG 2>&1 &
        FWD1_PID=$!
        KILLPIDS="$KILLPIDS $FWD1_PID"
        cd $TESTWD
@@ -576,7 +576,7 @@ EOF
 
        echo "Starting forwarders again"
        cd $FWD1_DIR
-       $SLAPD -F slapd.d -h $FWD1_URI -d $LVL $TIMING >> $FWD1_LOG 2>&1 &
+       $SLAPD -F slapd.d -h $FWD1_URI -d $LVL >> $FWD1_LOG 2>&1 &
        FWD1_PID=$!
        KILLPIDS="$KILLPIDS $FWD1_PID"
        cd $TESTWD

diff --git a/tests/scripts/test062-config-delete b/tests/scripts/test062-config-delete
index c7a1ed299d0bbdd5b8a07d3d81eea7efb6b71b2a..139e463599d3dd0ea6ff3ab517108bf9b9f848a0 100755 (executable)
--- a/tests/scripts/test062-config-delete
+++ b/tests/scripts/test062-config-delete
@@ -40,7 +40,7 @@ echo "Starting slapd on TCP/IP port $PORT1... $PWD"
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CONFDIR -n 0 -l $CONFLDIF
 cd $TESTDIR
-$SLAPD -F ./slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test063-delta-multiprovider b/tests/scripts/test063-delta-multiprovider
index 3f7dd5c6f0e60b8c350dec3b45d0efd75699ebb8..6fa6c2ebfc3ad2598a2c5c1c443984e020fc84e4 100755 (executable)
--- a/tests/scripts/test063-delta-multiprovider
+++ b/tests/scripts/test063-delta-multiprovider
@@ -191,7 +191,7 @@ PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}
 LOG=`eval echo '$LOG'$n`
-$SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F slapd.d -h $MYURI -d $LVL > $LOG 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test064-constraint b/tests/scripts/test064-constraint
index dd7b1675e6d35f4decce0b633acdfa46d8b1b752..b98498719619d4c54b0327e260a37f4331d2d7aa 100755 (executable)
--- a/tests/scripts/test064-constraint
+++ b/tests/scripts/test064-constraint
@@ -122,7 +122,7 @@ EOF
 $SLAPADD -F $CONFDIR -n 0 -l $TESTDIR/config.ldif
 
 echo "Starting slapd on TCP/IP port $PORT1..."
-$SLAPD -F $CONFDIR -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CONFDIR -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
        echo PID $PID

diff --git a/tests/scripts/test066-autoca b/tests/scripts/test066-autoca
index b94408fbc650a2e695485bcd7b73f1a095d2d271..6c59d41cbde49f49f5a5dfa0d7dac02a7fa4e052 100755 (executable)
--- a/tests/scripts/test066-autoca
+++ b/tests/scripts/test066-autoca
@@ -40,7 +40,7 @@ $SLAPPASSWD -g -n >$CONFIGPWF
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CFDIR -n 0 -l $CONFLDIF
-$SLAPD -F $CFDIR -h $URIP1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CFDIR -h $URIP1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test067-tls b/tests/scripts/test067-tls
index d16b336463c139df45206ec8c721ecd39bfd0e8f..d85eadaca13454f7807c1dc77cedb1f9fbcebf03 100755 (executable)
--- a/tests/scripts/test067-tls
+++ b/tests/scripts/test067-tls
@@ -59,7 +59,7 @@ fi
 
 echo "Starting ldap:/// slapd on TCP/IP port $PORT1 and ldaps:/// slapd on $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $TLSCONF > $CONF1
-$SLAPD -f $CONF1 -h "$URI1 $SURI2" -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h "$URI1 $SURI2" -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test068-sasl-tls-external b/tests/scripts/test068-sasl-tls-external
index 0b91aa197fd5a83aec8d574c09d435efcc6a9e5a..71fcfce9039875c739110266cb08f9defff04f7e 100755 (executable)
--- a/tests/scripts/test068-sasl-tls-external
+++ b/tests/scripts/test068-sasl-tls-external
@@ -36,7 +36,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting ldap:/// slapd on TCP/IP port $PORT1 and ldaps:/// slapd on $PORT2..."
-$SLAPD -f $CONF1 -h "$URI1 $SURI2" -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h "$URI1 $SURI2" -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test069-delta-multiprovider-starttls b/tests/scripts/test069-delta-multiprovider-starttls
index f5013fbaff999c0794aa7f9c6013a39357cc22e2..7fdc18306186a390571716a9a85845fbc529b579 100755 (executable)
--- a/tests/scripts/test069-delta-multiprovider-starttls
+++ b/tests/scripts/test069-delta-multiprovider-starttls
@@ -200,7 +200,7 @@ PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}
 LOG=`eval echo '$LOG'$n`
-$SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F slapd.d -h $MYURI -d $LVL > $LOG 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test070-delta-multiprovider-ldaps b/tests/scripts/test070-delta-multiprovider-ldaps
index fe824a66f34c90d0a16c31f61971df0234908d4f..030ba3a1299ec032ec225a19807b4f5e71e5672d 100755 (executable)
--- a/tests/scripts/test070-delta-multiprovider-ldaps
+++ b/tests/scripts/test070-delta-multiprovider-ldaps
@@ -199,7 +199,7 @@ PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}
 LOG=`eval echo '$LOG'$n`
-$SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F slapd.d -h $MYURI -d $LVL > $LOG 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test071-dirsync b/tests/scripts/test071-dirsync
index d73b1957d179dc96bac5e5266d50238d393e48ac..789531e3ad404a435bd164e5feb22583e61fd825 100755 (executable)
--- a/tests/scripts/test071-dirsync
+++ b/tests/scripts/test071-dirsync
@@ -88,7 +88,7 @@ objectclass: dcObject
 o: OpenLDAP Testing
 
 EOMODS
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID

diff --git a/tests/scripts/test072-dsee-sync b/tests/scripts/test072-dsee-sync
index 9fe844b250b707949021232a253becf4cb891c13..1e351d5f97f74e9cf522df65c5fca131b48cb637 100755 (executable)
--- a/tests/scripts/test072-dsee-sync
+++ b/tests/scripts/test072-dsee-sync
@@ -70,7 +70,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $DSEESYNC1CONF > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID

diff --git a/tests/scripts/test073-asyncmeta b/tests/scripts/test073-asyncmeta
index 6110456e540fe3df638c498d0cffeada4e8d94ac..6874e43ea75dc35ebb26d67060c4852065db75e6 100755 (executable)
--- a/tests/scripts/test073-asyncmeta
+++ b/tests/scripts/test073-asyncmeta
@@ -34,7 +34,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -73,7 +73,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -112,7 +112,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $ASYNCMETACONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test074-asyncmeta-concurrency b/tests/scripts/test074-asyncmeta-concurrency
index a78b6f6df45d524bb18b42c70243ec9d0b5f71b8..9d4ab285b4ab3a5a90bf9dca494060ecc4c9c5a0 100755 (executable)
--- a/tests/scripts/test074-asyncmeta-concurrency
+++ b/tests/scripts/test074-asyncmeta-concurrency
@@ -42,7 +42,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF1 > $CONF1
-$SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -f $CONF1 -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -81,7 +81,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $METACONF2 > $CONF2
-$SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
+$SLAPD -f $CONF2 -h $URI2 -d $LVL > $LOG2 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -120,7 +120,7 @@ fi
 
 echo "Starting slapd on TCP/IP port $PORT3..."
 . $CONFFILTER $BACKEND $MONITORDB < $ASYNCMETACONF > $CONF3
-$SLAPD -f $CONF3 -h $URI3 -d $LVL $TIMING > $LOG3 2>&1 &
+$SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test075-dsee-persist b/tests/scripts/test075-dsee-persist
index 3b4d44392f02bd56ca224c935bcd57211ae9318f..dbf21443370e93a3e54ef39197c2745911a31300 100755 (executable)
--- a/tests/scripts/test075-dsee-persist
+++ b/tests/scripts/test075-dsee-persist
@@ -73,7 +73,7 @@ fi
 
 echo "Starting consumer slapd on TCP/IP port $PORT4..."
 . $CONFFILTER $BACKEND $MONITORDB < $DSEESYNC2CONF > $CONF4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING > $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL > $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID
@@ -363,7 +363,7 @@ fi
 
 echo "Restarting consumer..."
 echo "RESTART" >> $LOG4
-$SLAPD -f $CONF4 -h $URI4 -d $LVL $TIMING >> $LOG4 2>&1 &
+$SLAPD -f $CONF4 -h $URI4 -d $LVL >> $LOG4 2>&1 &
 CONSUMERPID=$!
 if test $WAIT != 0 ; then
     echo CONSUMERPID $CONSUMERPID

diff --git a/tests/scripts/test076-authid-rewrite b/tests/scripts/test076-authid-rewrite
index 46f2e0687061e1d9bb82a2f3bacc0b7419de45fd..f7a89d629a666cdf62cc32ee9dd4c3972b56b32e 100755 (executable)
--- a/tests/scripts/test076-authid-rewrite
+++ b/tests/scripts/test076-authid-rewrite
@@ -32,7 +32,7 @@ echo "Starting slapd on TCP/IP port $PORT1... $PWD"
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CONFDIR -n 0 -l $CONFLDIF
 cd $TESTDIR
-$SLAPD -F ./slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F ./slapd.d -h $URI1 -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID

diff --git a/tests/scripts/test077-sasl-gssapi b/tests/scripts/test077-sasl-gssapi
index 88d5ef8f8e89c18b889cdec9ef009ba624320516..9631160b109ccb3fcf821df9d06914c258ed3b23 100755 (executable)
--- a/tests/scripts/test077-sasl-gssapi
+++ b/tests/scripts/test077-sasl-gssapi
@@ -63,7 +63,7 @@ if test $RC != 0 ; then
 fi
 
 echo "Starting ldap:/// slapd on TCP/IP port $PORT1 and ldaps:/// slapd on $PORT2..."
-$SLAPD -F $CONFDIR -h "$URI1 $SURI2" -d $LVL $TIMING > $LOG1 2>&1 &
+$SLAPD -F $CONFDIR -h "$URI1 $SURI2" -d $LVL > $LOG1 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
        echo PID $PID

diff --git a/tests/scripts/test078-persistent-sessionlog b/tests/scripts/test078-persistent-sessionlog
index a95256edfcd609f7c469d96911b55b2ec68d834c..bc7b77c6465dcb6a3858b45170d6086636c612f4 100755 (executable)
--- a/tests/scripts/test078-persistent-sessionlog
+++ b/tests/scripts/test078-persistent-sessionlog
@@ -189,7 +189,7 @@ PORT=`eval echo '$PORT'$n`
 echo "Starting server $n on TCP/IP port $PORT..."
 cd ${XDIR}${n}
 LOG=`eval echo '$LOG'$n`
-$SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F slapd.d -h $MYURI -d $LVL > $LOG 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
     echo PID $PID
@@ -374,9 +374,9 @@ cd ${XDIR}${n}
 LOG=`eval echo '$LOG'$n`
 echo "RESTART" >> $LOG
 #if test $n = 2; then
-#echo $SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING
+#echo $SLAPD -F slapd.d -h $MYURI -d $LVL
 #else
-$SLAPD -F slapd.d -h $MYURI -d $LVL $TIMING > $LOG 2>&1 &
+$SLAPD -F slapd.d -h $MYURI -d $LVL > $LOG 2>&1 &
 #fi
 PID=$!
 if test $WAIT != 0 ; then