Cascading replication misc cleanup

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 6b2bcf29c3f23cea0ccfb5232ed3e093eb4143de..99654ecd5d60f3c90bca4cd6a57ad7a045258b44 100644 (file)
--- 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 a4f6664a355423c4cb678906d67688b0f0e28a8e..618d86657482359d1593d6c85191071a2e36f882 100755 (executable)
--- 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 4a3c792ab8aa8e72790f35bad17e31c8b5ad8ef6..ada9d44b0b35516cf4bec0ef7bbfd1ec89cc81a0 100755 (executable)
--- 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 ca78c35a7010037b1b1a4ce83bbb2eaea9d42e1e..524684fe88bf19896027ec54949bca8c200a0928 100755 (executable)
--- 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