From 36445924b5b28855813c0ad01577b9cca7c1045e Mon Sep 17 00:00:00 2001
From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 14 Aug 1998 23:59:42 +0000
Subject: [PATCH] Create log files for slapd, sleep between tests to let things
 exit.

---
 tests/scripts/all                 | 2 ++
 tests/scripts/defines.sh          | 2 ++
 tests/scripts/test001-ldif2ldbm   | 2 +-
 tests/scripts/test001-slapadd     | 2 +-
 tests/scripts/test002-populate    | 2 +-
 tests/scripts/test003-search      | 2 +-
 tests/scripts/test004-modify      | 2 +-
 tests/scripts/test006-acls        | 2 +-
 tests/scripts/test007-replication | 4 ++--
 9 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/scripts/all b/tests/scripts/all
index 451c739caa..8d111d2c71 100755
--- 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 6d8bf2f391..f6d7a7c51c 100755
--- 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 1381d20df7..b97a6f77e4 100755
--- 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 1381d20df7..b97a6f77e4 100755
--- 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 60516a494a..62d6923bbc 100755
--- 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 0c5fb632b2..a9655da2ad 100755
--- 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 cee0bf25ae..35caa4c518 100755
--- 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 c0e0dc5820..d4b8ee3ad1 100755
--- 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 096082a406..cfc24edd5e 100755
--- 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..."
-- 
2.39.5