From: HAMANO Tsukasa <hamano@osstech.co.jp>
Date: Wed, 8 Jun 2022 03:09:29 +0000 (+0900)
Subject: ITS#9859 specifiy modulepath and moduleload for tests
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bc0f750939269e50e61192e854862cac870bb28;p=thirdparty%2Fopenldap.git

ITS#9859 specifiy modulepath and moduleload for tests

moduleload ../rel/mod.la works on build directry ex: make test
but it doesn't work with installed slapd.
It should be specified the modulepath and moduleload separately like other tests.
---

diff --git a/tests/data/slapd-component.conf b/tests/data/slapd-component.conf
index 5c0f6d124f..50058ffb97 100644
--- a/tests/data/slapd-component.conf
+++ b/tests/data/slapd-component.conf
@@ -25,7 +25,8 @@ include		@DATADIR@/ditcontentrules.conf
 pidfile		@TESTDIR@/slapd.1.pid
 argsfile	@TESTDIR@/slapd.1.args
 
-moduleload      @DATADIR@/comp_libs/compmatch.la
+modulepath      @DATADIR@/comp_libs/
+moduleload      compmatch.la
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
diff --git a/tests/data/slapd-deref.conf b/tests/data/slapd-deref.conf
index d89a032e09..791015403e 100644
--- a/tests/data/slapd-deref.conf
+++ b/tests/data/slapd-deref.conf
@@ -24,7 +24,8 @@ argsfile	@TESTDIR@/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-#derefmod#moduleload ../servers/slapd/overlays/deref.la
+#derefmod#modulepath ../servers/slapd/overlays/
+#derefmod#moduleload deref.la
 
 #######################################################################
 # database definitions
diff --git a/tests/data/slapd-glue-syncrepl1.conf b/tests/data/slapd-glue-syncrepl1.conf
index 0f25df8cfd..1d91176462 100644
--- a/tests/data/slapd-glue-syncrepl1.conf
+++ b/tests/data/slapd-glue-syncrepl1.conf
@@ -23,7 +23,8 @@ argsfile	@TESTDIR@/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-#syncprovmod#moduleload ../servers/slapd/overlays/syncprov.la
+#syncprovmod#modulepath ../servers/slapd/overlays/
+#syncprovmod#moduleload syncprov.la
 
 #######################################################################
 # database definitions
diff --git a/tests/data/slapd-glue-syncrepl2.conf b/tests/data/slapd-glue-syncrepl2.conf
index 7fb82f90c2..4268ff54cd 100644
--- a/tests/data/slapd-glue-syncrepl2.conf
+++ b/tests/data/slapd-glue-syncrepl2.conf
@@ -23,7 +23,8 @@ argsfile	@TESTDIR@/slapd.2.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-#syncprovmod#moduleload ../servers/slapd/overlays/syncprov.la
+#syncprovmod#modulepath ../servers/slapd/overlays/
+#syncprovmod#moduleload syncprov.la
 
 #######################################################################
 # database definitions
diff --git a/tests/data/slapd-homedir.conf b/tests/data/slapd-homedir.conf
index ee7a9ab23d..65b7cf7506 100644
--- a/tests/data/slapd-homedir.conf
+++ b/tests/data/slapd-homedir.conf
@@ -25,7 +25,8 @@ argsfile	@TESTDIR@/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-#homedirmod#moduleload ../servers/slapd/overlays/homedir.la
+#homedirmod#modulepath ../servers/slapd/overlays/
+#homedirmod#moduleload homedir.la
 
 #######################################################################
 # database definitions
diff --git a/tests/data/slapd-valsort.conf b/tests/data/slapd-valsort.conf
index af68ec67ae..5b84349aa1 100644
--- a/tests/data/slapd-valsort.conf
+++ b/tests/data/slapd-valsort.conf
@@ -24,7 +24,8 @@ argsfile	@TESTDIR@/slapd.1.args
 
 #mod#modulepath	../servers/slapd/back-@BACKEND@/
 #mod#moduleload	back_@BACKEND@.la
-#valsortmod#moduleload ../servers/slapd/overlays/valsort.la
+#valsortmod#modulepath ../servers/slapd/overlays/
+#valsortmod#moduleload valsort.la
 
 #######################################################################
 # database definitions
diff --git a/tests/scripts/test082-remoteauth b/tests/scripts/test082-remoteauth
index d3e0ba194d..1fb706306e 100755
--- a/tests/scripts/test082-remoteauth
+++ b/tests/scripts/test082-remoteauth
@@ -313,7 +313,8 @@ echo "Testing slapd.conf support..."
 sed -e "s,database\\s*monitor,\\
 TLSCACertificateFile $TESTDIR/tls/ca/certs/testsuiteCA.crt\\
 \\
-#remoteauthmod#moduleload ../servers/slapd/overlays/remoteauth.la\\
+#remoteauthmod#modulepath ../servers/slapd/overlays/\\
+#remoteauthmod#moduleload remoteauth.la\\
 include $TESTDIR/remoteauth.conf\\
 \\
 database monitor," $TLSCONF | . $CONFFILTER $BACKEND >$CONF1