ITS#8734 - Fix testsuite for asyncmeta

Some portions of the test suite did not correctly handle asyncmeta, fix
those issues.  Tests execute and pass after this change

diff --git a/tests/data/slapd-asyncmeta.conf b/tests/data/slapd-asyncmeta.conf
index 8af4932f55eb10e456006201b8bdf21991211623..9c96167dd854d5c9e8017ba18eeeab279e503179 100644 (file)
--- a/tests/data/slapd-asyncmeta.conf
+++ b/tests/data/slapd-asyncmeta.conf
@@ -24,8 +24,8 @@ argsfile      @TESTDIR@/slapd.m.args
 
 #ldapmod#modulepath ../servers/slapd/back-ldap/
 #ldapmod#moduleload back_ldap.la
-#metamod#modulepath ../servers/slapd/back-meta/
-#metamod#moduleload back_meta.la
+#asyncmetamod#modulepath ../servers/slapd/back-asyncmeta/
+#asyncmetamod#moduleload back_asyncmeta.la
 #monitormod#modulepath ../servers/slapd/back-monitor/
 #monitormod#moduleload back_monitor.la
 

diff --git a/tests/run.in b/tests/run.in
index a90106251c036982bc054dca85758c6907ce36e1..c5f9dc456b47a07faf3b8ea8b945e8578670f97c 100644 (file)
--- a/tests/run.in
+++ b/tests/run.in
@@ -69,7 +69,7 @@ fi
 if test "${AC_meta}" = "metamod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
        AC_meta="metano"
 fi
-if test "${AC_asyncmeta}" = "metamod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
+if test "${AC_asyncmeta}" = "asyncmetamod" && test "${AC_LIBS_DYNAMIC}" = "static" ; then
        AC_meta="asyncmetano"
 fi
 export AC_ldap AC_mdb AC_meta AC_asyncmeta AC_monitor AC_null AC_relay AC_sql \

diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 5c89ea881f4de4f5cbe6294a6e686a3c32baca9e..15bb454f9172d42323053c735b01aa9b073e7e99 100755 (executable)
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@@ -40,6 +40,7 @@ sed -e "s/@BACKEND@/${BACKEND}/"                      \
        -e "s/^#${BACKENDTYPE}#//"                      \
        -e "s/^#${AC_ldap}#//"                          \
        -e "s/^#${AC_meta}#//"                          \
+       -e "s/^#${AC_asyncmeta}#//"                     \
        -e "s/^#${AC_relay}#//"                         \
        -e "s/^#${AC_sql}#//"                           \
                -e "s/^#${RDBMS}#//"                    \