ITS#2401 support tests for dynamically loaded backends

2025-12-24 00:29:35 -05:00 · 2003-04-30 03:04:18 +00:00 · 2003-04-30 03:04:18 +00:00 · 2ce5398ec4
commit 2ce5398ec4
parent b10f1c5780
36 changed files with 118 additions and 211 deletions
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@ -17,10 +17,10 @@ test-bdb:	FORCE
 	@-$(LN_S) $(srcdir)/data .
 	@-$(LN_S) $(top_srcdir)/servers/slapd/schema .
 	@-$(LN_S) ../libraries/liblunicode ucdata
-	@if test "$(BUILD_BDB)" = "yes" ; then \
+	@if test "$(BUILD_BDB)" != "no"; then \
 		echo "Initiating LDAP tests for BDB..." ; \
 		$(MKDIR) test-db test-repl || true; \
-		$(srcdir)/scripts/all $(srcdir) bdb $(BUILD_MONITOR) ; \
+		$(srcdir)/scripts/all $(srcdir) bdb $(BUILD_BDB) $(BUILD_MONITOR) ; \
 	else \
 		echo "run configure with --enable-bdb" ; \
 	fi
@ -30,10 +30,10 @@ test-hdb:	FORCE
 	@-$(LN_S) $(srcdir)/data .
 	@-$(LN_S) $(top_srcdir)/servers/slapd/schema .
 	@-$(LN_S) ../libraries/liblunicode ucdata
-	@if test "$(BUILD_HDB)" = "yes" ; then \
+	@if test "$(BUILD_HDB)" != "no" ; then \
 		echo "Initiating LDAP tests for HDB..." ; \
 		$(MKDIR) test-db test-repl || true; \
-		$(srcdir)/scripts/all $(srcdir) hdb $(BUILD_MONITOR) ; \
+		$(srcdir)/scripts/all $(srcdir) hdb $(BUILD_HDB) $(BUILD_MONITOR) ; \
 	else \
 		echo "run configure with --enable-hdb" ; \
 	fi
@ -43,10 +43,10 @@ test-ldbm:	FORCE
 	@-$(LN_S) $(srcdir)/data .
 	@-$(LN_S) $(top_srcdir)/servers/slapd/schema .
 	@-$(LN_S) ../libraries/liblunicode ucdata
-	@if test "$(BUILD_LDBM)" = "yes" ; then \
+	@if test "$(BUILD_LDBM)" != "no"; then \
 		echo "Initiating LDAP tests for LDBM..." ; \
 		$(MKDIR) test-db test-repl || true; \
-		$(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_MONITOR); \
+		$(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_LDBM) $(BUILD_MONITOR); \
 	else \
 		echo "run configure with --enable-ldbm" ; \
 	fi
--- a/tests/data/slapd-acl.conf
+++ b/tests/data/slapd-acl.conf
@ -14,6 +14,9 @@ argsfile    ./test-db/slapd.args
 access to dn.base="" attr=objectClass by users read
 access to * by * read

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-dnssrv.conf
+++ b/tests/data/slapd-dnssrv.conf
@ -10,6 +10,9 @@ argsfile    ./test-db/slapd.args
 sasl-secprops noanonymous
 #sasl-secprops none

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-glue.conf
+++ b/tests/data/slapd-glue.conf
@ -11,6 +11,9 @@ include ./schema/openldap.schema
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-master.conf
+++ b/tests/data/slapd-master.conf
@ -10,6 +10,9 @@ include ./schema/openldap.schema
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-nis-master.conf
+++ b/tests/data/slapd-nis-master.conf
@ -13,6 +13,9 @@ include		./schema/internet_mail.oc.conf
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-passwd.conf
+++ b/tests/data/slapd-passwd.conf
@ -10,6 +10,9 @@ include ./schema/openldap.schema
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-pw.conf
+++ b/tests/data/slapd-pw.conf
@ -12,6 +12,9 @@ argsfile    ./test-db/slapd.args

 # password-hash	{md5}

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-ref-slave.conf
+++ b/tests/data/slapd-ref-slave.conf
@ -11,6 +11,9 @@ include ./schema/openldap.schema
 pidfile     ./test-repl/slapd.pid
 argsfile    ./test-repl/slapd.args

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-referrals.conf
+++ b/tests/data/slapd-referrals.conf
@ -10,6 +10,9 @@ include ./schema/openldap.schema
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-repl-master.conf
+++ b/tests/data/slapd-repl-master.conf
@ -11,6 +11,9 @@ include ./schema/openldap.schema
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-repl-slave.conf
+++ b/tests/data/slapd-repl-slave.conf
@ -11,6 +11,9 @@ include ./schema/openldap.schema
 pidfile     ./test-repl/slapd.pid
 argsfile    ./test-repl/slapd.args

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-repl-submaster.conf
+++ b/tests/data/slapd-repl-submaster.conf
@ -11,6 +11,9 @@ include ./schema/openldap.schema
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-repl-subslave.conf
+++ b/tests/data/slapd-repl-subslave.conf
@ -11,6 +11,9 @@ include ./schema/openldap.schema
 pidfile     ./test-repl/slapd.pid
 argsfile    ./test-repl/slapd.args

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd-schema.conf
+++ b/tests/data/slapd-schema.conf
@ -24,6 +24,9 @@ argsfile    ./test-db/slapd.args
 #
 rootdse 	./data/rootdse.ldif

+modulepath	../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/data/slapd.conf
+++ b/tests/data/slapd.conf
@ -11,6 +11,9 @@ include ./schema/openldap.schema
 pidfile     ./test-db/slapd.pid
 argsfile    ./test-db/slapd.args

+modulepath      ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
 #######################################################################
 # ldbm database definitions
 #######################################################################
--- a/tests/scripts/all
+++ b/tests/scripts/all
@ -22,6 +22,14 @@ fi

 echo ">>>>> Backend: $BACKEND"

+if test $# -eq 0 ; then
+	BACKENDTYPE=yes
+else
+	BACKENDTYPE=$1; shift
+fi
+
+echo ">>>>> Backend Type: $BACKENDTYPE"
+
 if test $# -eq 0 ; then
 	MONITOR=no
 else
@ -35,7 +43,7 @@ TN=`$SHTOOL echo -e "%b"`

 for CMD in $SRCDIR/scripts/test*; do
 	echo ">>>>> Starting ${TB}`basename $CMD`${TN} ..."
-	$CMD $SRCDIR $BACKEND $MONITOR
+	$CMD $SRCDIR $BACKEND $BACKENDTYPE $MONITOR
 	RC=$?
 	if test $RC -eq 0 ; then
 		echo ">>>>> $CMD completed ${TB}OK${TN}."
--- a/tests/scripts/args.sh
+++ b/tests/scripts/args.sh
@ -0,0 +1,21 @@
+# $OpenLDAP$
+
+BACKEND=bdb
+if test $# -ge 1 ; then
+        BACKEND=$1; shift
+fi
+
+BACKENDTYPE=yes
+if test $# -ge 1 ; then
+        BACKENDTYPE=$1; shift
+fi
+
+MONITORDB=no
+if test $# -ge 1 ; then
+        MONITORDB=$1; shift
+fi
+
+WAIT=0
+if test $# -ge 1 ; then
+        WAIT=1; shift
+fi
--- a/tests/scripts/conf.sh
+++ b/tests/scripts/conf.sh
@ -5,7 +5,11 @@ if [ x"$MONITORDB" = x"yes" ] ; then
 else
 	MON=nomonitor
 fi
+if [ x"$BACKENDTYPE" = x"mod" ]; then
+	MODULELOAD="moduleload	back_${BACKEND}.la"
+fi
 sed -e "s/@BACKEND@/${BACKEND}/"	\
+	-e "s/@MODULELOAD@/${MODULELOAD}/" \
 	-e "s/^#${BACKEND}#//"			\
 	-e "s/^#${MON}#//"				\
 	-e "s/@PORT@/${PORT}/"			\
--- a/tests/scripts/test000-rootdse
+++ b/tests/scripts/test000-rootdse
@ -5,19 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi

-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test001-slapadd
+++ b/tests/scripts/test001-slapadd
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test002-populate
+++ b/tests/scripts/test002-populate
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test003-search
+++ b/tests/scripts/test003-search
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test004-modify
+++ b/tests/scripts/test004-modify
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test006-acls
+++ b/tests/scripts/test006-acls
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test007-replication
+++ b/tests/scripts/test007-replication
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test008-concurrency
+++ b/tests/scripts/test008-concurrency
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test009-referral
+++ b/tests/scripts/test009-referral
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test010-passwd
+++ b/tests/scripts/test010-passwd
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test011-subtree-repl
+++ b/tests/scripts/test011-subtree-repl
@ -8,18 +8,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test012-glue
+++ b/tests/scripts/test012-glue
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test013-language
+++ b/tests/scripts/test013-language
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test014-whoami
+++ b/tests/scripts/test014-whoami
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test015-xsearch
+++ b/tests/scripts/test015-xsearch
@ -5,18 +5,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
--- a/tests/scripts/test016-subref
+++ b/tests/scripts/test016-subref
@ -6,18 +6,8 @@ SRCDIR="."
 if test $# -ge 1 ; then
 	SRCDIR=$1; shift
 fi
-BACKEND=bdb
-if test $# -ge 1 ; then
-	BACKEND=$1; shift
-fi
-MONITORDB=no
-if test $# -ge 1 ; then
-	MONITORDB=$1; shift
-fi
-WAIT=0
-if test $# -ge 1 ; then
-	WAIT=1; shift
-fi
+
+. $SRCDIR/scripts/args.sh

 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh