Fixed various rm statements to use more common expression format.

Patch provided by dj@gregor.com.

diff --git a/tests/Make-template b/tests/Make-template
index d92003f629f541bc6082faf19ca524d6223b6016..7e6be68593cd990dda13c2e554edc5dcb286322f 100644 (file)
--- a/tests/Make-template
+++ b/tests/Make-template
@@ -26,7 +26,7 @@ install:      FORCE
 depend:        FORCE
 
 clean: FORCE
-       $(RM) test-db/[^C]* test-repl/[^C]*
+       $(RM) test-db/[!C]* test-repl/[!C]*
 
 veryclean:     clean
 

diff --git a/tests/scripts/test001-ldif2ldbm b/tests/scripts/test001-ldif2ldbm
index b97a6f77e45d5955ffd42b185f308e8d86e3ed96..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/[^C]*
+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 b97a6f77e45d5955ffd42b185f308e8d86e3ed96..26d10fff941b332d9a9d760d906fcd9a3507e567 100755 (executable)
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -5,7 +5,7 @@
 
 echo "Cleaning up in $DBDIR..."
 
-rm -f $DBDIR/[^C]*
+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 bf01845fd8b040389474b62308d33f87df9fecf0..4f31092f4800a271b503e2a9f12d0e8a642fe0e0 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -5,7 +5,7 @@
 
 echo "Cleaning up in $DBDIR..."
 
-rm -f $DBDIR/[^C]*
+rm -f $DBDIR/[!C]*
 
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $CONF -p $PORT -d 1 > $MASTERLOG 2>&1 &

diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index a9655da2ade132cb789d9f8876b067fc2ad7f3a3..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/[^C]*
+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 35caa4c51846416b02efd1f280636bc722d38268..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/[^C]*
+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 a9b1b4c519f0dffca2a36849254f38afa4966555..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/[^C]*
+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 6a643cb4888be3ad32f12f5d56e99a8a609a52c6..0be88238b455f2420d177a61e42c04759be8c23e 100755 (executable)
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -13,9 +13,9 @@
 . scripts/defines.sh
 
 echo "Cleaning up in $DBDIR..."
-rm -f $DBDIR/[^C]*
+rm -f $DBDIR/[!C]*
 echo "Cleaning up in $REPLDIR..."
-rm -f $REPLDIR/[^C]*
+rm -f $REPLDIR/[!C]*
 
 echo "Starting master slapd on TCP/IP port $PORT..."
 $SLAPD -f $MASTERCONF -p $PORT -d 1 > $MASTERLOG 2>&1 &