From 420b15f7134d46c12b5139c800e43de2f6fb9c68 Mon Sep 17 00:00:00 2001
From: Jong Hyuk Choi <jongchoi@openldap.org>
Date: Thu, 26 Jun 2003 07:18:50 +0000
Subject: [PATCH] Cascading replication misc cleanup

---
 tests/Makefile.in                             |  6 ++---
 tests/scripts/test017-syncreplication-refresh |  5 ++--
 tests/scripts/test018-syncreplication-persist |  5 ++--
 .../scripts/test020-syncreplication-cascading | 25 +++++++++++--------
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6b2bcf29c3..99654ecd5d 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -25,7 +25,7 @@ test-bdb:	FORCE
 	@-$(LN_S) ../libraries/liblunicode ucdata
 	@if test "$(BUILD_BDB)" != "no"; then \
 		echo "Initiating LDAP tests for BDB..." ; \
-		$(MKDIR) test-db test-repl test-repl/r1 test-repl/r2 test-repl/p1 test-repl/p2 test-repl/p3 || true; \
+		$(MKDIR) test-db test-repl || true; \
 		$(srcdir)/scripts/all $(srcdir) bdb $(BUILD_BDB) $(BUILD_MONITOR) ; \
 	else \
 		echo "run configure with --enable-bdb" ; \
@@ -38,7 +38,7 @@ test-hdb:	FORCE
 	@-$(LN_S) ../libraries/liblunicode ucdata
 	@if test "$(BUILD_HDB)" != "no" ; then \
 		echo "Initiating LDAP tests for HDB..." ; \
-		$(MKDIR) test-db test-repl test-repl/r1 test-repl/r2 test-repl/p1 test-repl/p2 test-repl/p3 || true; \
+		$(MKDIR) test-db test-repl || true; \
 		$(srcdir)/scripts/all $(srcdir) hdb $(BUILD_HDB) $(BUILD_MONITOR) ; \
 	else \
 		echo "run configure with --enable-hdb" ; \
@@ -51,7 +51,7 @@ test-ldbm:	FORCE
 	@-$(LN_S) ../libraries/liblunicode ucdata
 	@if test "$(BUILD_LDBM)" != "no"; then \
 		echo "Initiating LDAP tests for LDBM..." ; \
-		$(MKDIR) test-db test-repl test-repl/r1 test-repl/r2 test-repl/p1 test-repl/p2 test-repl/p3 || true; \
+		$(MKDIR) test-db test-repl || true; \
 		$(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_LDBM) $(BUILD_MONITOR); \
 	else \
 		echo "run configure with --enable-ldbm" ; \
diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh
index a4f6664a35..618d866574 100755
--- a/tests/scripts/test017-syncreplication-refresh
+++ b/tests/scripts/test017-syncreplication-refresh
@@ -27,8 +27,9 @@ echo "running defines.sh"
 
 echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
-echo "Cleaning up in $R1REPLDIR..."
-rm -rf $R1REPLDIR/[!C]*
+echo "Resetting $R1REPLDIR..."
+rm -rf $R1REPLDIR
+mkdir $R1REPLDIR
 
 echo "Starting master slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $DBCONF
diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index 4a3c792ab8..ada9d44b0b 100755
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -27,8 +27,9 @@ echo "running defines.sh"
 
 echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
-echo "Cleaning up in $P1REPLDIR..."
-rm -rf $P1REPLDIR/[!C]*
+echo "Resetting $P1REPLDIR..."
+rm -rf $P1REPLDIR
+mkdir $P1REPLDIR
 
 echo "Starting master slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $DBCONF
diff --git a/tests/scripts/test020-syncreplication-cascading b/tests/scripts/test020-syncreplication-cascading
index ca78c35a70..524684fe88 100755
--- a/tests/scripts/test020-syncreplication-cascading
+++ b/tests/scripts/test020-syncreplication-cascading
@@ -27,16 +27,21 @@ echo "running defines.sh"
 
 echo "Cleaning up in $DBDIR..."
 rm -f $DBDIR/[!C]*
-echo "Cleaning up in $R1REPLDIR..."
-rm -rf $R1REPLDIR/[!C]*
-echo "Cleaning up in $R2REPLDIR..."
-rm -rf $R2REPLDIR/[!C]*
-echo "Cleaning up in $P1REPLDIR..."
-rm -rf $P1REPLDIR/[!C]*
-echo "Cleaning up in $P2REPLDIR..."
-rm -rf $P2REPLDIR/[!C]*
-echo "Cleaning up in $P3REPLDIR..."
-rm -rf $P3REPLDIR/[!C]*
+echo "Resetting $R1REPLDIR..."
+rm -rf $R1REPLDIR
+mkdir $R1REPLDIR
+echo "Resetting $R2REPLDIR..."
+rm -rf $R2REPLDIR
+mkdir $R2REPLDIR
+echo "Resetting $P1REPLDIR..."
+rm -rf $P1REPLDIR
+mkdir $P1REPLDIR
+echo "Resetting $P2REPLDIR..."
+rm -rf $P2REPLDIR
+mkdir $P2REPLDIR
+echo "Resetting $P3REPLDIR..."
+rm -rf $P3REPLDIR
+mkdir $P3REPLDIR
 
 echo "Starting master slapd on TCP/IP port $PORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $DBCONF
-- 
2.39.5