Commit 5b378868 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Disable test030-relay when threads are unavailable (ITS#4297)

parent e1ce45ac
......@@ -4,6 +4,8 @@ OpenLDAP 2.3.15 Engineering
Fixed slapd strerror logging bug (ITS#4292)
Fixed slapd-ldap password modify exop password return (ITS#4294)
Fixed slapd ACL add/delete fraction issue (ITS#4295)
Build environment
Disable test030-relay when threads are unavailable (ITS#4297)
OpenLDAP 2.3.14 Release
Fixed slapd assertion control restrictions
......
......@@ -39,20 +39,28 @@ if test "x$RELAYS" = "x" ; then
if test $BACKLDAP = ldapno ; then
echo "ldap backend not available, test skipped"
else
if test "x$RELAYS" != "x" ; then
RELAYS="${RELAYS} "
fi
RELAYS="${RELAYS}ldap"
if test $THREADS = "threadsno" ; then
echo "Need threads support, test skipped"
else
if test "x$RELAYS" != "x" ; then
RELAYS="${RELAYS} "
fi
RELAYS="${RELAYS}ldap"
fi
fi
# back-meta
if test $BACKMETA = metano ; then
echo "meta backend not available, test skipped"
else
if test "x$RELAYS" != "x" ; then
RELAYS="${RELAYS} "
if test $THREADS = "threadsno" ; then
echo "Need threads support, test skipped"
else
if test "x$RELAYS" != "x" ; then
RELAYS="${RELAYS} "
fi
RELAYS="${RELAYS}meta"
fi
RELAYS="${RELAYS}meta"
fi
fi
......@@ -67,19 +75,31 @@ echo ""
first=1
for RELAY in $RELAYS ; do
if test $first = 1 ; then
first=0
else
echo ">>>>> waiting 10 seconds for things to exit"
sleep 10
echo ""
rm -rf $TESTDIR
RUNIT=yes
if test $THREADS = "threadsno" ; then
case $RELAY in
ldap|meta)
echo "Need threads support, test skipped"
RUNIT=no
;;
esac
fi
if test $RUNIT = yes ; then
if test $first = 1 ; then
first=0
else
echo ">>>>> waiting 10 seconds for things to exit"
sleep 10
echo ""
rm -rf $TESTDIR
fi
mkdir -p $TESTDIR $DBDIR1
. $SRCDIR/scripts/relay
mkdir -p $TESTDIR $DBDIR1
. $SRCDIR/scripts/relay
fi
done
echo ">>>>> Test succeeded"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment