Fix cleanup code to use standard expressions for ignoring CVS directories.

Merge from main patch provided by dj@gregor.com.

diff --git a/tests/Make-template b/tests/Make-template
index f8cae98bf08ae7d4c83665094d4367e3c1217dee..7e6be68593cd990dda13c2e554edc5dcb286322f 100644 (file)
--- a/tests/Make-template
+++ b/tests/Make-template
@@ -17,6 +17,8 @@ SCRIPTSDIR=./scripts
 
 all:   FORCE
        @echo "Initiating LDAP tests..."; \
+       test -d test-db || $(MKDIR) test-db ; \
+       test -d test-repl || $(MKDIR) test-repl ; \
        $(SCRIPTSDIR)/all $(SCRIPTSDIR)
 
 install:       FORCE
@@ -24,7 +26,7 @@ install:      FORCE
 depend:        FORCE
 
 clean: FORCE
-       $(RM) test-db/* test-repl/*
+       $(RM) test-db/[!C]* test-repl/[!C]*
 
 veryclean:     clean
 

diff --git a/tests/scripts/makeldbm.sh b/tests/scripts/makeldbm.sh
index bb2aac035c595384ed31313159b8394c520df30a..0431f37fe17c018e1b97819d655da6f004d7d1ea 100755 (executable)
--- a/tests/scripts/makeldbm.sh
+++ b/tests/scripts/makeldbm.sh
@@ -4,7 +4,7 @@
 
 echo "Cleaning up in $DBDIR..."
 
-rm -f $DBDIR/*
+rm -f $DBDIR/[!C]*
 
 echo "Running ldif2ldbm to build slapd database..."
 $LDIF2LDBM -f $CONF -i $LDIF -e ../servers/slapd/tools

diff --git a/tests/scripts/test001-ldif2ldbm b/tests/scripts/test001-ldif2ldbm
index d22e04c8e0791fadab91bed24cbf02baffa1c22a..26d10fff941b332d9a9d760d906fcd9a3507e567 100755 (executable)
--- a/tests/scripts/test001-ldif2ldbm
+++ b/tests/scripts/test001-ldif2ldbm
@@ -5,7 +5,7 @@
 
 echo "Cleaning up in $DBDIR..."
 
-rm -f $DBDIR/*
+rm -f $DBDIR/[!C]*
 
 echo "Running ldif2ldbm to build slapd database..."
 $LDIF2LDBM -f $CONF -i $LDIF -e ../servers/slapd/tools
@@ -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 c04d1f5f651563490d48c84af5991a70b06ebccb..4f31092f4800a271b503e2a9f12d0e8a642fe0e0 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -5,10 +5,10 @@
 
 echo "Cleaning up in $DBDIR..."
 
-rm -f $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..."
@@ -44,8 +44,13 @@ if [ $RC != 0 ]; then
        exit $RC
 fi
 
-echo "Comparing retrieved entries to LDIF file used to create database"
-cmp $SEARCHOUT $LDIF
+echo "Filtering ldapsearch results..."
+. scripts/acfilter.sh < $SEARCHOUT > $SEARCHFLT
+echo "Filtering original ldif used to create database..."
+. scripts/acfilter.sh < $LDIF > $LDIFFLT
+echo "Comparing filter output..."
+cmp $SEARCHFLT $LDIFFLT
+
 if [ $? != 0 ]; then
        echo "comparison failed - database was not created correctly"
        exit 1

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 0912550608cd2c813a09508ce523c102c4c2bfb0..868ea4b8409118736cf923f001799fd276170bbd 100755 (executable)
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@@ -4,7 +4,7 @@
 
 echo "Cleaning up in $DBDIR..."
 
-rm -f $DBDIR/*
+rm -f $DBDIR/[!C]*
 
 echo "Running ldif2ldbm to build slapd database..."
 $LDIF2LDBM -f $CONF -i $LDIF -e ../servers/slapd/tools
@@ -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 09a4fdfee1134601803b17e3332f3b5461b894ec..8f31d33c73e96df4fc1bb0257492ab5a7096c61a 100755 (executable)
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@@ -4,7 +4,7 @@
 
 echo "Cleaning up in $DBDIR..."
 
-rm -f $DBDIR/*
+rm -f $DBDIR/[!C]*
 
 echo "Running ldif2ldbm to build slapd database..."
 $LDIF2LDBM -f $CONF -i $LDIF -e ../servers/slapd/tools
@@ -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 ec1c964d108e4596e956580b8ecd5c5e16fb1bfb..3805692b0d2a0cc99631c4503435230b9c138989 100755 (executable)
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@@ -4,7 +4,7 @@
 
 echo "Cleaning up in $DBDIR..."
 
-rm -f $DBDIR/*
+rm -f $DBDIR/[!C]*
 
 echo "Running ldif2ldbm to build slapd database..."
 $LDIF2LDBM -f $CONF -i $LDIF -e ../servers/slapd/tools
@@ -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..."
@@ -96,8 +96,7 @@ EOMODS4
 
 echo "Using ldapsearch to retrieve all the entries..."
 $LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \
-           'objectClass=*' | egrep -iv '^modifytimestamp|^modifiersname' \
-           >> $SEARCHOUT 2>&1
+           'objectClass=*' | . scripts/acfilter.sh >> $SEARCHOUT 2>&1
 RC=$?
 kill -HUP $PID
 if [ $RC != 0 ]; then

diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index c0f49136c5c7e5413ed7df90d740ddf0ef4ffbf9..0be88238b455f2420d177a61e42c04759be8c23e 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -13,16 +13,16 @@
 . scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
-rm -f $DBDIR/*
+rm -f $DBDIR/[!C]*
 echo "Cleaning up in $REPLDIR..."
-rm -f $REPLDIR/*
+rm -f $REPLDIR/[!C]*
 
 echo "Starting master slapd on TCP/IP port $PORT..."
-$SLAPD -f $MASTERCONF -p $PORT -d 1 > /dev/null 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 > /dev/null 2>&1 &
+$SLAPD -f $SLAVECONF -p $SLAVEPORT -d 1 > $SLAVELOG 2>&1 &
 SLAVEPID=$!
 
 echo "Using ldapsearch to check that master slapd is running..."
@@ -48,7 +48,7 @@ for i in 0 1 2 3 4 5; do
 done
 
 echo "Starting slurpd..."
-$SLURPD -f $MASTERCONF -d 4 -t $REPLDIR > /dev/null 2>&1 &
+$SLURPD -f $MASTERCONF -d 4 -t $REPLDIR > $SLURPLOG 2>&1 &
 SLURPPID=$!
 
 echo "Using ldapmodify to populate the database..."
@@ -123,8 +123,8 @@ changetype: delete
 
 EOMODS
 
-echo "Waiting 10 seconds for slurpd to send changes..."
-sleep 10
+echo "Waiting 15 seconds for slurpd to send changes..."
+sleep 15
 
 echo "Using ldapsearch to read all the entries from the master..."
 $LDAPSEARCH -L -S "" -b "$BASEDN" -h localhost -p $PORT \