From: Kurt Zeilenga <kurt@openldap.org>
Date: Fri, 14 Aug 1998 05:04:45 +0000 (+0000)
Subject: Added better rm expressions.
X-Git-Tag: LDAP_3_3+prerelease~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f96fee80d35876d5eae3e4f6517b13ae4e29f81e;p=openldap

Added better rm expressions.
---

diff --git a/tests/scripts/makeldbm.sh b/tests/scripts/makeldbm.sh
index bb2aac035c..44834903a9 100755
--- 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 d22e04c8e0..1381d20df7 100755
--- 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
diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index d22e04c8e0..1381d20df7 100755
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -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
diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index c04d1f5f65..60516a494a 100755
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -5,7 +5,7 @@
 
 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 &
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index 0912550608..0c5fb632b2 100755
--- 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
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index 09a4fdfee1..cee0bf25ae 100755
--- 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
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index ec1c964d10..c0e0dc5820 100755
--- 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
diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index c0f49136c5..096082a406 100755
--- 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 > ./test-repl/master.out 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 > ./test-repl/slave.out 2>&1 &
 SLAVEPID=$!
 
 echo "Using ldapsearch to check that master slapd is running..."