ITS#2401 support tests for dynamically loaded backends

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 39cedf75959cbe93546deaa96df53aec71c4d616..a2b48b948a41e3aebc3bd987fc9aa06f799d7eef 100644 (file)
--- 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 cdc44e6fd6081c75df7a1a1c68b64c8f0bbdd963..9858f137e9d79b09555edd2da42f13ebc031a042 100644 (file)
--- 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 60fef032510c153e57b173f517f540e8c12265f6..1c1c5e89c52990a86929fb92371ee96cf647e05b 100644 (file)
--- 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 69256c39fd676717b1927d80a9a90b92bef3739d..257f75f7e129e604701de3ecd0a30f4de0da782d 100644 (file)
--- 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 2d4e879bd41640b000ee6baf8cb5b4db38ba20bd..a11c45afde9305b63d6bf988d87277df2eb9ec48 100644 (file)
--- 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 dc56ac87e187cf44cb742b596e11b13590fec932..405f986f2bd2b0843308ab266c89e5568ea25ffa 100644 (file)
--- 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 1238d24649f04a5c3a62a0499bdd3a91f5a9cfb1..d6e2dadcb4b42986507f87ede3b39c6bc7f20663 100644 (file)
--- 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 a40542e220c35e68798d56c29677c34876cbe321..8fb5b873e51af38a9413cf6fd0457cbed44513f1 100644 (file)
--- 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 f9335b767bcdd5ebed8e14d53c319874f8eeb70b..109c7632084cd2697c51c340d61e72e4499b3740 100644 (file)
--- 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 03255fb5bc295b63558976470121206f02cb8bc3..a523cc030ccba952a8d683d83f8f9edf91e935f9 100644 (file)
--- 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 48c1c1b9b30486c4bd428186112af76e828e65f1..0123ae6a389cc710aea75323a18d5e4edac4aa6d 100644 (file)
--- 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 64449bc7321d95c5749498b0926f3e84cc4f2033..18c6e1c4e67f10b60786193a94cff8d8798be7fc 100644 (file)
--- 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 fc76bc13c31746cecf8acee0cbb23737d65ab344..f7598665c6942aa87a411174d3a647d3f04a4950 100644 (file)
--- 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 a584af0bf11f74edf926fc4a8e7bd25465da796b..c6ba42f792946af019f01b1973dd2377843b6d9a 100644 (file)
--- 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 791d49dcba39f67cfa528c1314330a43a35a890a..78581775c7040d89da208cb6664cf2b57df2016f 100644 (file)
--- 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 ce2f117d57854dbd2318e6309265b7c43b1cc994..5d6f39169c109fee965f59523c3bf3fe5e002e25 100644 (file)
--- 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 85cb1a0edbec5bf4746e99e2abbf94b17c8cfb12..1e4a4d1da27b0a5955a3d2f09022285fe028a70d 100755 (executable)
--- 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 (executable)
index 0000000..e0c6d65
--- /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 28978c50171aa215693d58933eeb3a43a83a11e0..147a9a2ccb45149f457a9a3004eba96e88a12273 100755 (executable)
--- 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 e61bc01eaf6a9e9c9313b6113dcfc173d5320bb7..0723ca7d2c7761d677b42d366d0c4d68aa476ad6 100755 (executable)
--- 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 1c355a7b59f465d3286bfc777a3415b102d489c8..7828edb414925bd5158ba6f8f9b2171a03a69be8 100755 (executable)
--- 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 5f4ba5a436781cf19b6e3dac0e01b88fe0a06c9c..acb3384e72be23b9f43aae282140171c2bdc12a8 100755 (executable)
--- 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 fb411d0dfdc0d3dce43ac185ae3fee3363d29efa..51d7fd6ff66df80eeb518a85a2e1c2e4fe0bdf34 100755 (executable)
--- 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 d0b4b9092ec9c5621e6b14da4702653d5380d24b..7180318b7657aa577d5a59442fa806f789fcd3e7 100755 (executable)
--- 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 213a0c9ef075291d7df11b4ce8fb61c3ca1f4d10..86b7265b0a6b3c03b2b1914a5bdc28dc457f03a6 100755 (executable)
--- 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 22fb4c78a465837d33a546a3cb9b44b8da4f1087..00560ed238132dc00d9b243b2c25b3b2ad5dc558 100755 (executable)
--- 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 762c34bf28ecff2c3d3fc7df0ea50bdd36e70ac0..51b27621eda84ea050faa68327a0deda4b685c88 100755 (executable)
--- 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 c63fafec5a454ca64b98934c88218bcec7100b34..21eca2ce60bae66288c573ebced9ccac72743e78 100755 (executable)
--- 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 fa03a8126d8eaa0d3360cfe34e4def33642da3a4..0e481649ccfe7ede4cd10489a142ebcbdf7831df 100755 (executable)
--- 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 2a9e27f8f9fcf6342f199dd6f8981ca807a325cb..0fa5021a15cb61e7b3623d1f6d8a8f16b94adc87 100755 (executable)
--- 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 994d38aa7937fd3f71002173acc2b1484094f37c..ce778688a57ed0bdb5f3454cf7de4d32b8f74f4b 100755 (executable)
--- 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 a8b93f06985effbd73364fda4e795697ff1a3738..a163f8f08c8e65f264d298efc37eff881ebfce75 100755 (executable)
--- 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 c87a91da46232b2fd1d71b9a1839961533bef911..a929e2a53cbbada49eb604937c8a42f73a223aa7 100755 (executable)
--- 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 d120c556601830ef6b2d3f20a251e5d0a7b98612..e3deb09b9c1cc2bd3603b6f9952a4bde0d49a6ce 100755 (executable)
--- 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 621ce8f12f40e1f94805d0f721900ffe0abd0167..fb14c7014e960f182d65fee16b61eac60909a9bc 100755 (executable)
--- 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 686786d8ce7baf6b16e7d06a2c51b5fbdc146140..740f04591b3a2515bfa039007c716447d876f6a5 100755 (executable)
--- 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