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

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

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

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..."

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..."

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..."

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..."

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..."

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..."

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..."