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 5c0f6d124f843a97ba878418173febdfd247208e..50058ffb97e27d420c19acd5843258492e58d99c 100644 (file)
--- 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 d89a032e091a73450fc1d59bebfe532e5e253139..791015403e648fc11f019b346410cac38e996a4a 100644 (file)
--- 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 0f25df8cfd5d809c0e11e0ac52b2e013741e85ae..1d91176462e6db69e923ad32fe00b06a0624036d 100644 (file)
--- 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 7fb82f90c239b14cede11b120ec9fa4af5395c83..4268ff54cd90aaf1f9ba8efa8999a1fbc10a462a 100644 (file)
--- 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 ee7a9ab23d843eb8a8997824f35200a7f452417d..65b7cf7506f41b2093bb4ec4dce466ee2fa4fd3f 100644 (file)
--- 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 af68ec67aeec945f0d4476bc1d5922d6e50751a9..5b84349aa1c85cffbe24df09c1586beb556f5852 100644 (file)
--- 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 d3e0ba194dc54179756f8065a649705db673cc83..1fb706306eef4bbc6fde5e3229d000bd7c6723ef 100755 (executable)
--- 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