Commit ba592af1 authored by HAMANO Tsukasa's avatar HAMANO Tsukasa
Browse files

Merge branch 'its9859' into 'master'

ITS#9859 fix test

See merge request !534
parents f451ec47 8bc0f750
Pipeline #4387 passed with stage
in 51 minutes and 58 seconds
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -40,6 +40,11 @@ if test $BACKEND = ldif ; then
exit 0
fi
if test $BACKEND = wt ; then
echo "Test does not support $BACKEND backend, test skipped"
exit 0
fi
mkdir -p $TESTDIR $DBDIR1 $DBDIR2
# Test proxy caching:
......
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment