some TESTDIR fixes

diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index 15c0710653fbdd3833a18f688738f309b4f7fc7b..61c0f8cca2b7b80bc46ed2d4c29332d0f501432d 100755 (executable)
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@@ -16,7 +16,7 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-mkdir -p $TESTRUN $DBDIR1
+mkdir -p $TESTDIR $DBDIR1
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SCHEMACONF > $CONF1

diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index df82d1fee85f070d649eeb98a08ac2506a765149..fb1fc469dc55f2cfa56788342c74d517a365a321 100755 (executable)
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@@ -16,7 +16,7 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-mkdir -p $TESTRUN $DBDIR1
+mkdir -p $TESTDIR $DBDIR1
 
 echo "Running slapadd to build slapd database..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $ADDCONF

diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 8d15b5dc51d2dbcc139cf465982c6348a273fd8d..fe24cb2f17cce043a3ee5cbc27294f7236b04e42 100755 (executable)
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@@ -16,7 +16,7 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-mkdir -p $TESTRUN $DBDIR1 
+mkdir -p $TESTDIR $DBDIR1 
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1

diff --git a/tests/scripts/test014-whoami b/tests/scripts/test014-whoami
index a612864b909207d02cbddd6d76a199a0bf0ba14c..62734714ac5a38f9610a3a7bcc6192cca3548604 100755 (executable)
--- a/tests/scripts/test014-whoami
+++ b/tests/scripts/test014-whoami
@@ -422,6 +422,6 @@ echo ">>>>> Test succeeded"
 exit 0
 
 ## Note to developers: when SLAPD_DEBUG=-1 the command
-## awk '/^do_extended$/ {if (c) {print c} c=0} /<===slap_sasl_match:/ {c++} END {print c}' testrun/slapd.1.log
+## awk '/^do_extended$/ {if (c) {print c} c=0} /<===slap_sasl_match:/ {c++} END {print c}' $TESTDIR/slapd.1.log
 ## must return the sequence 1 2 3 4 5 6 7 8 9 9 1 2 3 4 5 6 7 8 9 9 9 1
 ## to indicate that the authzFrom and authzTo rules applied in the right order.

diff --git a/tests/scripts/test027-emptydn b/tests/scripts/test027-emptydn
index 1553147e95edfacd26f4695845f1a6e09427152a..efb922ae50725a184599c9bfd0060ae58c00a6de 100755 (executable)
--- a/tests/scripts/test027-emptydn
+++ b/tests/scripts/test027-emptydn
@@ -91,7 +91,7 @@ fi
 echo "Comparison of database generated via slapadd succeeded"
 
 echo "Cleaning up database directories..."
-/bin/rm -rf testrun/db.*
+/bin/rm -rf $TESTDIR/db.*
 
 mkdir -p $TESTDIR $DBDIR1 $DBDIR2