Renamed subdirectories to hide rm warnings

diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf
index 68dc8d8f256b5cfb0a91dd81ad57fc686d5b576f..bbe2c22011e823bceecf2e923af051c402038501 100644 (file)
--- a/tests/data/slapd-glue.conf
+++ b/tests/data/slapd-glue.conf
@@ -19,7 +19,7 @@ argsfile    ./test-db/slapd.args
 database       @BACKEND@
 suffix         "ou=Information Technology Division,ou=People,o=University of Michigan, c=US"
 subordinate
-directory      ./test-db/1
+directory      ./test-db/C_db1
 rootdn         "cn=Manager, o=University of Michigan, c=US"
 rootpw         secret
 #ldbm#index            objectclass     eq
@@ -34,7 +34,7 @@ rootpw                secret
 database       @BACKEND@
 suffix         "ou=Groups,o=University of Michigan, c=US"
 subordinate
-directory      ./test-db/2
+directory      ./test-db/C_db2
 rootdn         "cn=Manager, o=University of Michigan, c=US"
 rootpw         secret
 #ldbm#index            objectclass     eq
@@ -48,7 +48,7 @@ rootpw                secret
 
 database       @BACKEND@
 suffix         "o=University of Michigan, c=US"
-directory      ./test-db/3
+directory      ./test-db/C_db3
 rootdn         "cn=Manager, o=University of Michigan, c=US"
 rootpw         secret
 #ldbm#index            objectclass     eq

diff --git a/tests/scripts/test012-glue b/tests/scripts/test012-glue
index 12d0bd1e93da03209e56e63dbe5d23a5d39e15b4..890877367481effec3463548868ddb6316cec8e9 100755 (executable)
--- a/tests/scripts/test012-glue
+++ b/tests/scripts/test012-glue
@@ -19,9 +19,9 @@ echo "running defines.sh"
 
 echo "Cleaning up in $DBDIR..."
 
-mkdir $DBDIR/1 $DBDIR/2 $DBDIR/3
+mkdir $DBDIR/C_db1 $DBDIR/C_db2 $DBDIR/C_db3
 
-rm -f $DBDIR/[!C]* $DBDIR/?/*
+rm -f $DBDIR/[!C]* $DBDIR/C_db?/*
 
 echo "Running slapadd to build glued slapd databases..."
 . $CONFFILTER $BACKEND < $GLUECONF > $DBCONF
@@ -75,7 +75,7 @@ fi
 
 echo "OK...  Cleaning up in $DBDIR..."
 
-rm -f $DBDIR/?/*
+rm -f $DBDIR/C_db?/*
 
 echo "Starting slapd on TCP/IP port $PORT..."
 $SLAPD -f $DBCONF -h $MASTERURI -d $LVL $TIMING > $MASTERLOG 2>&1 &