From: Hallvard Furuseth <hallvard@openldap.org>
Date: Thu, 29 Sep 2005 22:26:43 +0000 (+0000)
Subject: Minor cleanup to match the other tests:
X-Git-Tag: OPENLDAP_REL_ENG_2_2_MP~352
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bc729ea9ba68d31b85e598a822c3b65b9136f648;p=openldap

Minor cleanup to match the other tests:
Always mkdir $TESTDIR when making subdirs, and always use mkdir -p anyway.
Add or modify "test skipped" messages.
'exit 0' instead of 'exit'.
---

diff --git a/tests/scripts/sql-test001-concurrency b/tests/scripts/sql-test001-concurrency
index fe4da240a7..2bb0d73fc8 100755
--- a/tests/scripts/sql-test001-concurrency
+++ b/tests/scripts/sql-test001-concurrency
@@ -27,7 +27,7 @@ if test $RDBMS = "rdbmsno" ; then
 fi
 
 SQLDATADIR=$TESTDIR/sql-concurrency
-mkdir -p $SQLDATADIR
+mkdir -p $TESTDIR $SQLDATADIR
 
 echo "Starting slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SQLCONF > $CONF1
diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index e8f77b2277..8146f8299e 100755
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@@ -17,7 +17,7 @@ echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
 if test ! -x $SLURPD ; then
-	echo ">>>>> $SLURPD is not executable or do not exist."
+	echo ">>>>> $SLURPD is not executable or does not exist."
 	echo ">>>>> Test skipped."
 	exit 0
 fi
diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index e9781843a0..8fcd5b2ec6 100755
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@@ -20,7 +20,7 @@ echo "running defines.sh"
 # Test default referral
 #
 
-mkdir $TESTDIR $DBDIR1 $DBDIR2
+mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 echo "Running slapadd to build slapd database..."
 . $CONFFILTER $BACKEND $MONITORDB < $CONF > $CONF1
diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref
index 4c39beb527..c8326b8c2f 100755
--- a/tests/scripts/test016-subref
+++ b/tests/scripts/test016-subref
@@ -18,7 +18,7 @@ RCODE=10
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-mkdir $TESTDIR $DBDIR1
+mkdir -p $TESTDIR $DBDIR1
 
 echo "Running slapadd to build slapd database..."
 . $CONFFILTER $BACKEND $MONITORDB < $RCONF > $CONF1
diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade
index 2aa89e47dc..3a599a7e1e 100755
--- a/tests/scripts/test019-syncreplication-cascade
+++ b/tests/scripts/test019-syncreplication-cascade
@@ -26,7 +26,7 @@ if test $SYNCPROV = syncprovno; then
 	exit 0
 fi 
 
-mkdir $TESTDIR $DBDIR1 $DBDIR2 $DBDIR3 $DBDIR4 $DBDIR5 $DBDIR6
+mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR3 $DBDIR4 $DBDIR5 $DBDIR6
 
 #
 # Test replication:
diff --git a/tests/scripts/test021-certificate b/tests/scripts/test021-certificate
index 777f0d66d1..e9e5db579d 100755
--- a/tests/scripts/test021-certificate
+++ b/tests/scripts/test021-certificate
@@ -18,7 +18,7 @@ echo "running defines.sh"
 
 if test "$AC_WITH_TLS" != "yes" ; then
 	echo "test disabled, requires --with-tls"
-	exit
+	exit 0
 fi
 
 mkdir -p $TESTDIR $DBDIR1
diff --git a/tests/scripts/test031-component-filter b/tests/scripts/test031-component-filter
index f4e0a97f09..cda58d406a 100755
--- a/tests/scripts/test031-component-filter
+++ b/tests/scripts/test031-component-filter
@@ -20,8 +20,8 @@ echo "running defines.sh"
 ## Make sure that you turn on LDAP_COMP_MATCH in slapd source codes
 ## and --enable-modules  is configured yes
 if test "$AC_WITH_MODULES_ENABLED" != "yes" ; then
-        echo "dynamic module disabled "
-        exit
+        echo "dynamic module disabled, test skipped"
+        exit 0
 fi
 
 mkdir -p $TESTDIR $DBDIR1
@@ -38,7 +38,8 @@ if test $RC != 0 ; then
 	echo "slapadd failed ($RC)!"
 	echo "Be sure to have a certificate module in tests/data/comp_libs "
 	echo "The module is in openldap/contrib/slapd-modules/comp_match"
-	exit 
+	echo "Test skipped."
+	exit 0
 fi
 
 echo "Running slapindex to index slapd database..."
diff --git a/tests/scripts/test034-translucent b/tests/scripts/test034-translucent
index eeb863e47e..b42f104133 100755
--- a/tests/scripts/test034-translucent
+++ b/tests/scripts/test034-translucent
@@ -26,7 +26,7 @@ if test $TRANSLUCENT = translucentno ; then
 fi 
 
 if test $BACKEND = ldbm ; then
-	echo "Translucent Proxy overlay not qualified for use with LDBM, skipping"
+	echo "Translucent Proxy overlay not qualified for use with LDBM, test skipped"
 	exit 0
 fi
 
diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency
index b802c1372b..c1d81cddfd 100755
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@@ -25,7 +25,7 @@ fi
 
 # to be removed some time...
 if test "x$TEST_META" = "xno" ; then
-	echo "### disabled by \"TEST_META=no\"; unset TEST_META to re-enable"
+	echo '### Test disabled by "TEST_META=no"; unset TEST_META to re-enable'
 	echo ""
 	exit 0
 else
@@ -214,4 +214,3 @@ fi
 
 echo ">>>>> Test succeeded"
 exit 0
-
diff --git a/tests/scripts/test041-aci b/tests/scripts/test041-aci
index c56121bb1d..b38457de3c 100755
--- a/tests/scripts/test041-aci
+++ b/tests/scripts/test041-aci
@@ -26,7 +26,7 @@ echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
 if test "$ACI" = "acino" ; then
-	echo "ACI not enabled; skipping..."
+	echo "ACI not enabled, test skipped"
 	exit 0
 fi