From 302af6a0e7ec0cd5357d5a31df00642f76608d6e Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Mon, 12 Feb 2018 23:48:05 +0000 Subject: [PATCH] ITS#4326 - Fix regression test so it operates correctly --- tests/data/regressions/its4326/its4326 | 9 +++++++-- tests/data/regressions/its4326/slapd.conf | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/data/regressions/its4326/its4326 b/tests/data/regressions/its4326/its4326 index e70589761a..96ba6f0cb6 100755 --- a/tests/data/regressions/its4326/its4326 +++ b/tests/data/regressions/its4326/its4326 @@ -16,10 +16,15 @@ echo "running defines.sh" . $SRCDIR/scripts/defines.sh -if test $BACKLDAP != "ldapno" ; then +if test $BACKLDAP = "ldapno" ; then echo "LDAP backend not available, test skipped" exit 0 -fi +fi + +if test $BACKEND = "ldap" ; then + echo "LDAP backend not valid, test skipped" + exit 0 +fi mkdir -p $TESTDIR $DBDIR1 $DBDIR2 diff --git a/tests/data/regressions/its4326/slapd.conf b/tests/data/regressions/its4326/slapd.conf index a864e7ed88..79557887b6 100644 --- a/tests/data/regressions/its4326/slapd.conf +++ b/tests/data/regressions/its4326/slapd.conf @@ -24,8 +24,8 @@ include @DATADIR@/test.schema pidfile @TESTDIR@/slapd.2.pid argsfile @TESTDIR@/slapd.2.args -#mod#modulepath ../servers/slapd/back-ldap/ -#mod#moduleload back_ldap.la +#ldapmod#modulepath ../servers/slapd/back-ldap/ +#ldapmod#moduleload back_ldap.la #monitormod#modulepath ../servers/slapd/back-monitor/ #monitormod#moduleload back_monitor.la -- 2.39.5