From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 16 Dec 2005 16:38:15 +0000 (+0000)
Subject: fix ITS#4141 (better fix: split into 3 slapd; but it all makes little sense without... 
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~567
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d572ba8aa67cecf03336dc52be72f31b1b1881d8;p=openldap

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

diff --git a/tests/run.in b/tests/run.in
index 1becdae104..3c3ffb8e34 100644
--- 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 035d9e71dd..170b23a720 100755
--- 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 716a3442ab..360bf1a171 100755
--- 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