line up test030 and test032; first step toward their merge

[openldap] / tests / run.in

diff --git a/tests/run.in b/tests/run.in
index 35166ddd971f7a9486883666fbbc9c899d8f7073..e0ecc26fa4d9fc4386fb39a10f718dfda0375476 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -22,15 +22,32 @@ LN_S="@LN_S@"
 
 export SRCDIR TOPSRCDIR LN_S
 
+# backends
 AC_bdb=@BUILD_BDB@
 AC_hdb=@BUILD_HDB@
-AC_ldbm=@BUILD_LDBM@
 AC_ldap=ldap@BUILD_LDAP@
+AC_ldbm=@BUILD_LDBM@
+AC_monitor=@BUILD_MONITOR@
+AC_relay=relay@BUILD_RELAY@
+AC_sql=sql@BUILD_SQL@
+
+# overlays
+AC_glue=glue@BUILD_GLUE@
 AC_pcache=pcache@BUILD_PROXYCACHE@
-AC_MONITOR=@BUILD_MONITOR@
+AC_ppolicy=ppolicy@BUILD_PPOLICY@
+AC_refint=refint@BUILD_REFINT@
+AC_unique=unique@BUILD_UNIQUE@
+AC_rwm=rwm@BUILD_RWM@
+AC_syncprov=syncprov@BUILD_SYNCPROV@
+
+# misc
+AC_WITH_SASL=@WITH_SASL@
 AC_WITH_TLS=@WITH_TLS@
+AC_WITH_MODULES_ENABLED=@WITH_MODULES_ENABLED@
 
-export AC_MONITOR AC_WITH_TLS AC_ldap AC_pcache
+export AC_bdb AC_hdb AC_ldap AC_ldbm AC_monitor AC_relay AC_sql 
+export AC_glue AC_pcache AC_ppolicy AC_refint AC_unique AC_rwm AC_syncprov
+export AC_WITH_SASL AC_WITH_TLS AC_WITH_MODULES_ENABLED
 
 if test ! -x ../servers/slapd/slapd ; then
        echo "Could not locate slapd(8)"
@@ -121,9 +138,6 @@ fi
 if test ! -r schema/core.schema ; then
        ${LN_S} ${TOPSRCDIR}/servers/slapd/schema schema
 fi
-if test ! -r ucdata/UnicodeData.txt ; then
-       ${LN_S} ../libraries/liblunicode ucdata
-fi
 
 if test -d testrun ; then
        if test $PRESERVE = no ; then
@@ -155,7 +169,7 @@ if test $CLEAN = yes ; then
        echo "Cleaning up test run directory from this run."
        /bin/rm -rf testrun
        echo "Cleaning up symlinks."
-       /bin/rm -f testdata schema ucdata
+       /bin/rm -f testdata schema
 fi
 
 exit $RC