From 70b57c5667a69336311b707ba81f6a40a2adac22 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 13 May 2019 23:08:33 +0000 Subject: [PATCH] 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 --- tests/data/slapd-asyncmeta.conf | 4 ++-- tests/run.in | 2 +- tests/scripts/conf.sh | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/data/slapd-asyncmeta.conf b/tests/data/slapd-asyncmeta.conf index 8af4932f55..9c96167dd8 100644 --- 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 a90106251c..c5f9dc456b 100644 --- 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 5c89ea881f..15bb454f91 100755 --- 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}#//" \