From: Howard Chu <hyc@openldap.org>
Date: Wed, 30 Apr 2003 03:04:18 +0000 (+0000)
Subject: ITS#2401 support tests for dynamically loaded backends
X-Git-Tag: OPENLDAP_REL_ENG_2_2_0ALPHA~203
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2ce5398ec40ec597961dc0e86f64a14d8cd45bd6;p=openldap

ITS#2401 support tests for dynamically loaded backends
---

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 39cedf7595..a2b48b948a 100644
--- 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
diff --git a/tests/data/slapd-acl.conf b/tests/data/slapd-acl.conf
index cdc44e6fd6..9858f137e9 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-dnssrv.conf b/tests/data/slapd-dnssrv.conf
index 60fef03251..1c1c5e89c5 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-glue.conf b/tests/data/slapd-glue.conf
index 69256c39fd..257f75f7e1 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-master.conf b/tests/data/slapd-master.conf
index 2d4e879bd4..a11c45afde 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-nis-master.conf b/tests/data/slapd-nis-master.conf
index dc56ac87e1..405f986f2b 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-passwd.conf b/tests/data/slapd-passwd.conf
index 1238d24649..d6e2dadcb4 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-pw.conf b/tests/data/slapd-pw.conf
index a40542e220..8fb5b873e5 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-ref-slave.conf b/tests/data/slapd-ref-slave.conf
index f9335b767b..109c763208 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-referrals.conf b/tests/data/slapd-referrals.conf
index 03255fb5bc..a523cc030c 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-repl-master.conf b/tests/data/slapd-repl-master.conf
index 48c1c1b9b3..0123ae6a38 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-repl-slave.conf b/tests/data/slapd-repl-slave.conf
index 64449bc732..18c6e1c4e6 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-repl-submaster.conf b/tests/data/slapd-repl-submaster.conf
index fc76bc13c3..f7598665c6 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-repl-subslave.conf b/tests/data/slapd-repl-subslave.conf
index a584af0bf1..c6ba42f792 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd-schema.conf b/tests/data/slapd-schema.conf
index 791d49dcba..78581775c7 100644
--- 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
 #######################################################################
diff --git a/tests/data/slapd.conf b/tests/data/slapd.conf
index ce2f117d57..5d6f39169c 100644
--- 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
 #######################################################################
diff --git a/tests/scripts/all b/tests/scripts/all
index 85cb1a0edb..1e4a4d1da2 100755
--- 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}."
diff --git a/tests/scripts/args.sh b/tests/scripts/args.sh
new file mode 100755
index 0000000000..e0c6d653d1
--- /dev/null
+++ 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
diff --git a/tests/scripts/conf.sh b/tests/scripts/conf.sh
index 28978c5017..147a9a2ccb 100755
--- 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}/"			\
diff --git a/tests/scripts/test000-rootdse b/tests/scripts/test000-rootdse
index e61bc01eaf..0723ca7d2c 100755
--- 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
diff --git a/tests/scripts/test001-slapadd b/tests/scripts/test001-slapadd
index 1c355a7b59..7828edb414 100755
--- 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
diff --git a/tests/scripts/test002-populate b/tests/scripts/test002-populate
index 5f4ba5a436..acb3384e72 100755
--- 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
diff --git a/tests/scripts/test003-search b/tests/scripts/test003-search
index fb411d0dfd..51d7fd6ff6 100755
--- 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
diff --git a/tests/scripts/test004-modify b/tests/scripts/test004-modify
index d0b4b9092e..7180318b76 100755
--- 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
diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 213a0c9ef0..86b7265b0a 100755
--- 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
diff --git a/tests/scripts/test006-acls b/tests/scripts/test006-acls
index 22fb4c78a4..00560ed238 100755
--- 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
diff --git a/tests/scripts/test007-replication b/tests/scripts/test007-replication
index 762c34bf28..51b27621ed 100755
--- 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
diff --git a/tests/scripts/test008-concurrency b/tests/scripts/test008-concurrency
index c63fafec5a..21eca2ce60 100755
--- 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
diff --git a/tests/scripts/test009-referral b/tests/scripts/test009-referral
index fa03a8126d..0e481649cc 100755
--- 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
diff --git a/tests/scripts/test010-passwd b/tests/scripts/test010-passwd
index 2a9e27f8f9..0fa5021a15 100755
--- 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
diff --git a/tests/scripts/test011-subtree-repl b/tests/scripts/test011-subtree-repl
index 994d38aa79..ce778688a5 100755
--- 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
diff --git a/tests/scripts/test012-glue b/tests/scripts/test012-glue
index a8b93f0698..a163f8f08c 100755
--- 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
diff --git a/tests/scripts/test013-language b/tests/scripts/test013-language
index c87a91da46..a929e2a53c 100755
--- 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
diff --git a/tests/scripts/test014-whoami b/tests/scripts/test014-whoami
index d120c55660..e3deb09b9c 100755
--- 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
diff --git a/tests/scripts/test015-xsearch b/tests/scripts/test015-xsearch
index 621ce8f12f..fb14c7014e 100755
--- 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
diff --git a/tests/scripts/test016-subref b/tests/scripts/test016-subref
index 686786d8ce..740f04591b 100755
--- 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