Create log files for slapd, sleep between tests to let things exit.

diff --git a/tests/scripts/all b/tests/scripts/all
index 451c739caa1948a267c5b964c635ae45ac1d337b..8d111d2c71ecf2fb4b587785b1c70756059cee42 100755 (executable)
--- a/tests/scripts/all
+++ b/tests/scripts/all
@@ -19,5 +19,7 @@ for i in $SCRIPTDIR/test*; do
                echo ">>>>> $CMD failed (exit $RC)"
                exit $RC
        fi
+       echo ">>>>> waiting 5 seconds for things to exit"
+       sleep 5
        echo
 done

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 6d8bf2f3914ee96be39d585f33f1b456c70307f4..f6d7a7c51c508c0ea3475d1714ed65a027cf2929 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -6,6 +6,8 @@ LDAPMODIFY=../clients/tools/ldapmodify
 LDAPADD=../clients/tools/ldapadd
 PORT=9009
 SLAVEPORT=9010
+MASTERLOG=./test-db/slapd.log
+REPLLOG=./test-repl/slapd.log
 DBDIR=./test-db
 REPLDIR=./test-repl
 CONF=./data/slapd-master.conf

diff --git a/tests/scripts/test001-ldif2ldbm b/tests/scripts/test001-ldif2ldbm
index 1381d20df7eb811255f6e69b5f07062e9129aacd..b97a6f77e45d5955ffd42b185f308e8d86e3ed96 100755 (executable)
--- a/tests/scripts/test001-ldif2ldbm
+++ b/tests/scripts/test001-ldif2ldbm
@@ -16,7 +16,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > /dev/null 2>&1 &
+$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."

diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 1381d20df7eb811255f6e69b5f07062e9129aacd..b97a6f77e45d5955ffd42b185f308e8d86e3ed96 100755 (executable)
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -16,7 +16,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > /dev/null 2>&1 &
+$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to retrieve all the entries..."

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 60516a494ad8e39666dfb7bea01241f9196106f2..62d6923bbc1578ce438c278d2e01a5f9a32ab7d1 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -8,7 +8,7 @@ echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[^C]*
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > /dev/null 2>&1 &
+$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Using ldapsearch to check that slapd is running..."

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 0c5fb632b27b1506f936dc87ebd2f2a791b60b05..a9655da2ade132cb789d9f8876b067fc2ad7f3a3 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -15,7 +15,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > /dev/null 2>&1 &
+$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Testing slapd searching..."

diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index cee0bf25ae2ae68f90a2b760bb09054c4045b39b..35caa4c51846416b02efd1f280636bc722d38268 100755 (executable)
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -15,7 +15,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $CONF -p $PORT -d 1 > /dev/null 2>&1 &
+$SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Testing slapd modify operations..."

diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index c0e0dc5820756e5d35f50d459e16394dee8f22f1..d4b8ee3ad1750d13d553c39d8fd49bbb8d3cc0d3 100755 (executable)
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -15,7 +15,7 @@ if [ $RC != 0 ]; then
 fi
 
 echo "Starting slapd on TCP/IP port $PORT..."
-$SLAPD -f $ACLCONF -p $PORT -d 1 > /dev/null 2>&1 &
+$SLAPD -f $ACLCONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Testing slapd access control..."

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 096082a40652143d072cc8234b2941bc34d038df..cfc24edd5e55dbabc1cd9c2f3168f66dd6569126 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -18,11 +18,11 @@ echo "Cleaning up in $REPLDIR..."
 rm -f $REPLDIR/[^C]*
 
 echo "Starting master slapd on TCP/IP port $PORT..."
-$SLAPD -f $MASTERCONF -p $PORT -d 1 > ./test-repl/master.out 2>&1 &
+$SLAPD -f $MASTERCONF -p $PORT -d 1 > $MASTERLOG 2>&1 &
 PID=$!
 
 echo "Starting slave slapd on TCP/IP port $SLAVEPORT..."
-$SLAPD -f $SLAVECONF -p $SLAVEPORT -d 1 > ./test-repl/slave.out 2>&1 &
+$SLAPD -f $SLAVECONF -p $SLAVEPORT -d 1 > $SLAVELOG 2>&1 &
 SLAVEPID=$!
 
 echo "Using ldapsearch to check that master slapd is running..."