fix ITS#4141 (better fix: split into 3 slapd; but it all makes little sense without...

diff --git a/tests/run.in b/tests/run.in
index 1becdae104f74dfe89ddd7c9ac68e031e04c086a..3c3ffb8e340419e342269e2bd15bd3c9d86b5866 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -51,11 +51,13 @@ AC_WITH_SASL=@WITH_SASL@
 AC_WITH_TLS=@WITH_TLS@
 AC_WITH_MODULES_ENABLED=@WITH_MODULES_ENABLED@
 AC_ACI_ENABLED=aci@WITH_ACI_ENABLED@
+AC_THREADS=threads@BUILD_THREAD@
 
-export AC_bdb AC_hdb AC_ldap AC_ldbm AC_meta AC_monitor AC_relay AC_sql 
-export AC_accesslog AC_dynlist AC_pcache AC_ppolicy AC_refint AC_retcode
-export AC_rwm AC_unique AC_syncprov AC_translucent AC_valsort
-export AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED AC_ACI_ENABLED
+export AC_bdb AC_hdb AC_ldap AC_ldbm AC_meta AC_monitor AC_relay AC_sql \
+       AC_accesslog AC_dynlist AC_pcache AC_ppolicy AC_refint AC_retcode \
+       AC_rwm AC_unique AC_syncprov AC_translucent AC_valsort \
+       AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED AC_ACI_ENABLED \
+       AC_THREADS
 
 if test ! -x ../servers/slapd/slapd ; then
        echo "Could not locate slapd(8)"

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index 035d9e71dd1268e845f7c19364032a31c0ebfa26..170b23a720d8bbfa0896335a11660f5bf4d9a65a 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -27,14 +27,15 @@ PPOLICY=${AC_ppolicy-ppolicyno}
 REFINT=${AC_refint-refintno}
 RETCODE=${AC_retcode-retcodeno}
 RWM=${AC_rwm-rwmno}
+SYNCPROV=${AC_syncprov-syncprovno}
 TRANSLUCENT=${AC_translucent-translucentno}
 UNIQUE=${AC_unique-uniqueno}
-SYNCPROV=${AC_syncprov-syncprovno}
+VALSORT=${AC_valsort-valsortno}
 WITH_SASL=${AC_WITH_SASL-no}
 USE_SASL=${SLAPD_USE_SASL-no}
 WITHTLS=${AC_WITHTLS-yes}
 ACI=${AC_ACI_ENABLED-acino}
-VALSORT=${AC_valsort-valsortno}
+THREADS=${AC_THREADS-threadsno}
 
 PROGDIR=./progs
 DATADIR=${USER_DATADIR-./testdata}

diff --git a/tests/scripts/test028-idassert b/tests/scripts/test028-idassert
index 716a3442ab4129653f8ce84774766f8d1c858dcd..360bf1a1713f02412205b7e43dd5d2ee50c15947 100755 (executable)
--- a/tests/scripts/test028-idassert
+++ b/tests/scripts/test028-idassert
@@ -16,7 +16,7 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-echo "### This test requires the ldap backend."
+echo "### This test requires the LDAP backend and the rwm overlay."
 echo "### If available, and explicitly requested, it can use SASL bind;"
 echo "### note that SASL must be properly set up, and the requested"
 echo "### mechanism must be available.  Define SLAPD_USE_SASL={yes|<mech>},"
@@ -27,11 +27,16 @@ if test $BACKLDAP = "ldapno" ; then
        exit 0
 fi 
 
-if test $RWM = rwmno ; then 
+if test $RWM = "rwmno" ; then 
        echo "Rewrite/remap overlay not available, test skipped"
        exit 0
 fi 
 
+if test $THREADS = "threadsno" ; then
+       echo "Need threads support, test skipped"
+       exit 0
+fi 
+
 if test $WITH_SASL = "yes" ; then
        if test $USE_SASL != "no" ; then
                if test $USE_SASL = "yes" ; then