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

diff --git a/CHANGES b/CHANGES
index dea2649ee16cc2945ed5f83560f06d7a24df9a32..845e04bc2787cef7caf492c1cbb54ab8f30903a8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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

diff --git a/tests/scripts/test030-relay b/tests/scripts/test030-relay
index 4d8f50438dd197ec323a4f9d92e982441ea198b5..8ab4b6076f02c94bcec387eceddffe25914b61e1 100755 (executable)
--- a/tests/scripts/test030-relay
+++ b/tests/scripts/test030-relay
@@ -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"