mirror of
https://git.openldap.org/openldap/openldap.git
synced 2025-12-24 08:39:37 -05:00
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'.
This commit is contained in:
parent
0d360951d0
commit
bc729ea9ba
10 changed files with 13 additions and 13 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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..."
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue