Группа :: Система/Серверы
Пакет: openldap
навигация по пакетам
Главная Изменения Спек Патчи Загрузить Bugs and FR
Патч: openldap-2.1.19-ALT-Masato-Taruishi-030326.patch
Index: tests/Makefile.in
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/Makefile.in,v
retrieving revision 1.35
diff -u -r1.35 Makefile.in
--- tests/Makefile.in 3 Jan 2003 19:21:00 -0000 1.35
+++ tests/Makefile.in 26 Mar 2003 10:02:18 -0000
@@ -16,10 +16,10 @@
@-$(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
@@ -29,10 +29,10 @@
@-$(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
Index: tests/data/slapd-acl.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-acl.conf,v
retrieving revision 1.44
diff -u -r1.44 slapd-acl.conf
--- tests/data/slapd-acl.conf 24 Feb 2003 16:15:31 -0000 1.44
+++ tests/data/slapd-acl.conf 26 Mar 2003 10:02:18 -0000
@@ -14,6 +14,9 @@
access to dn.base="" attr=objectClass by users read
access to * by * read
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-dnssrv.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-dnssrv.conf,v
retrieving revision 1.9
diff -u -r1.9 slapd-dnssrv.conf
--- tests/data/slapd-dnssrv.conf 10 Mar 2002 16:39:08 -0000 1.9
+++ tests/data/slapd-dnssrv.conf 26 Mar 2003 10:02:18 -0000
@@ -10,6 +10,9 @@
sasl-secprops noanonymous
#sasl-secprops none
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-glue.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-glue.conf,v
retrieving revision 1.4
diff -u -r1.4 slapd-glue.conf
--- tests/data/slapd-glue.conf 8 Jun 2002 16:49:14 -0000 1.4
+++ tests/data/slapd-glue.conf 26 Mar 2003 10:02:18 -0000
@@ -11,6 +11,9 @@
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-master.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-master.conf,v
retrieving revision 1.32
diff -u -r1.32 slapd-master.conf
--- tests/data/slapd-master.conf 29 Aug 2002 00:32:58 -0000 1.32
+++ tests/data/slapd-master.conf 26 Mar 2003 10:02:18 -0000
@@ -10,6 +10,9 @@
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-nis-master.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-nis-master.conf,v
retrieving revision 1.9
diff -u -r1.9 slapd-nis-master.conf
--- tests/data/slapd-nis-master.conf 10 Mar 2002 16:39:08 -0000 1.9
+++ tests/data/slapd-nis-master.conf 26 Mar 2003 10:02:18 -0000
@@ -13,6 +13,9 @@
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-passwd.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-passwd.conf,v
retrieving revision 1.9
diff -u -r1.9 slapd-passwd.conf
--- tests/data/slapd-passwd.conf 10 Mar 2002 16:39:08 -0000 1.9
+++ tests/data/slapd-passwd.conf 26 Mar 2003 10:02:18 -0000
@@ -10,6 +10,9 @@
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-pw.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-pw.conf,v
retrieving revision 1.18
diff -u -r1.18 slapd-pw.conf
--- tests/data/slapd-pw.conf 24 Mar 2002 00:55:11 -0000 1.18
+++ tests/data/slapd-pw.conf 26 Mar 2003 10:02:18 -0000
@@ -12,6 +12,9 @@
# password-hash {md5}+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-ref-slave.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-ref-slave.conf,v
retrieving revision 1.24
diff -u -r1.24 slapd-ref-slave.conf
--- tests/data/slapd-ref-slave.conf 12 Aug 2002 20:33:43 -0000 1.24
+++ tests/data/slapd-ref-slave.conf 26 Mar 2003 10:02:18 -0000
@@ -11,6 +11,9 @@
pidfile ./test-repl/slapd.pid
argsfile ./test-repl/slapd.args
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-referrals.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-referrals.conf,v
retrieving revision 1.1
diff -u -r1.1 slapd-referrals.conf
--- tests/data/slapd-referrals.conf 21 Oct 2002 17:11:27 -0000 1.1
+++ tests/data/slapd-referrals.conf 26 Mar 2003 10:02:18 -0000
@@ -10,6 +10,9 @@
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-repl-master.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-repl-master.conf,v
retrieving revision 1.26
diff -u -r1.26 slapd-repl-master.conf
--- tests/data/slapd-repl-master.conf 12 Aug 2002 20:33:43 -0000 1.26
+++ tests/data/slapd-repl-master.conf 26 Mar 2003 10:02:18 -0000
@@ -11,6 +11,9 @@
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-repl-slave.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-repl-slave.conf,v
retrieving revision 1.30
diff -u -r1.30 slapd-repl-slave.conf
--- tests/data/slapd-repl-slave.conf 12 Aug 2002 20:33:43 -0000 1.30
+++ tests/data/slapd-repl-slave.conf 26 Mar 2003 10:02:18 -0000
@@ -11,6 +11,9 @@
pidfile ./test-repl/slapd.pid
argsfile ./test-repl/slapd.args
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-repl-submaster.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-repl-submaster.conf,v
retrieving revision 1.8
diff -u -r1.8 slapd-repl-submaster.conf
--- tests/data/slapd-repl-submaster.conf 5 Feb 2003 11:40:08 -0000 1.8
+++ tests/data/slapd-repl-submaster.conf 26 Mar 2003 10:02:18 -0000
@@ -11,6 +11,9 @@
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-repl-subslave.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-repl-subslave.conf,v
retrieving revision 1.6
diff -u -r1.6 slapd-repl-subslave.conf
--- tests/data/slapd-repl-subslave.conf 12 Aug 2002 20:33:43 -0000 1.6
+++ tests/data/slapd-repl-subslave.conf 26 Mar 2003 10:02:18 -0000
@@ -11,6 +11,9 @@
pidfile ./test-repl/slapd.pid
argsfile ./test-repl/slapd.args
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd-schema.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd-schema.conf,v
retrieving revision 1.19
diff -u -r1.19 slapd-schema.conf
--- tests/data/slapd-schema.conf 26 Feb 2003 21:40:24 -0000 1.19
+++ tests/data/slapd-schema.conf 26 Mar 2003 10:02:18 -0000
@@ -24,6 +24,9 @@
#
rootdse ./data/rootdse.ldif
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/data/slapd.conf
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/data/slapd.conf,v
retrieving revision 1.18
diff -u -r1.18 slapd.conf
--- tests/data/slapd.conf 10 Mar 2002 16:39:08 -0000 1.18
+++ tests/data/slapd.conf 26 Mar 2003 10:02:18 -0000
@@ -11,6 +11,9 @@
pidfile ./test-db/slapd.pid
argsfile ./test-db/slapd.args
+modulepath ../servers/slapd/back-@BACKEND@/
+@MODULELOAD@
+
#######################################################################
# ldbm database definitions
#######################################################################
Index: tests/scripts/all
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/all,v
retrieving revision 1.13
diff -u -r1.13 all
--- tests/scripts/all 19 Jun 2002 04:00:48 -0000 1.13
+++ tests/scripts/all 26 Mar 2003 10:02:18 -0000
@@ -23,6 +23,14 @@
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
MONITOR=$1; shift
@@ -35,7 +43,7 @@
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}."Index: tests/scripts/conf.sh
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/conf.sh,v
retrieving revision 1.11
diff -u -r1.11 conf.sh
--- tests/scripts/conf.sh 12 Aug 2002 20:27:24 -0000 1.11
+++ tests/scripts/conf.sh 26 Mar 2003 10:02:18 -0000
@@ -5,7 +5,11 @@
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}/" \Index: tests/scripts/test001-slapadd
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test001-slapadd,v
retrieving revision 1.33
diff -u -r1.33 test001-slapadd
--- tests/scripts/test001-slapadd 1 Sep 2002 09:39:08 -0000 1.33
+++ tests/scripts/test001-slapadd 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test002-populate
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test002-populate,v
retrieving revision 1.30
diff -u -r1.30 test002-populate
--- tests/scripts/test002-populate 1 Sep 2002 09:39:08 -0000 1.30
+++ tests/scripts/test002-populate 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test003-search
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test003-search,v
retrieving revision 1.47
diff -u -r1.47 test003-search
--- tests/scripts/test003-search 22 Mar 2003 21:27:56 -0000 1.47
+++ tests/scripts/test003-search 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test004-modify
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test004-modify,v
retrieving revision 1.42
diff -u -r1.42 test004-modify
--- tests/scripts/test004-modify 22 Feb 2003 14:55:08 -0000 1.42
+++ tests/scripts/test004-modify 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test005-modrdn
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test005-modrdn,v
retrieving revision 1.34
diff -u -r1.34 test005-modrdn
--- tests/scripts/test005-modrdn 1 Sep 2002 09:39:08 -0000 1.34
+++ tests/scripts/test005-modrdn 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test006-acls
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test006-acls,v
retrieving revision 1.36
diff -u -r1.36 test006-acls
--- tests/scripts/test006-acls 17 Feb 2003 20:36:17 -0000 1.36
+++ tests/scripts/test006-acls 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test007-replication
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test007-replication,v
retrieving revision 1.45
diff -u -r1.45 test007-replication
--- tests/scripts/test007-replication 24 Mar 2003 14:00:04 -0000 1.45
+++ tests/scripts/test007-replication 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test008-concurrency
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test008-concurrency,v
retrieving revision 1.26
diff -u -r1.26 test008-concurrency
--- tests/scripts/test008-concurrency 1 Sep 2002 09:39:08 -0000 1.26
+++ tests/scripts/test008-concurrency 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test009-referral
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test009-referral,v
retrieving revision 1.25
diff -u -r1.25 test009-referral
--- tests/scripts/test009-referral 23 Sep 2002 20:27:19 -0000 1.25
+++ tests/scripts/test009-referral 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test010-passwd
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test010-passwd,v
retrieving revision 1.12
diff -u -r1.12 test010-passwd
--- tests/scripts/test010-passwd 1 Sep 2002 09:39:08 -0000 1.12
+++ tests/scripts/test010-passwd 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test011-subtree-repl
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test011-subtree-repl,v
retrieving revision 1.20
diff -u -r1.20 test011-subtree-repl
--- tests/scripts/test011-subtree-repl 27 Feb 2003 21:41:13 -0000 1.20
+++ tests/scripts/test011-subtree-repl 26 Mar 2003 10:02:18 -0000
@@ -8,18 +8,8 @@
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
Index: tests/scripts/test012-glue
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test012-glue,v
retrieving revision 1.8
diff -u -r1.8 test012-glue
--- tests/scripts/test012-glue 1 Sep 2002 09:39:08 -0000 1.8
+++ tests/scripts/test012-glue 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test013-language
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test013-language,v
retrieving revision 1.6
diff -u -r1.6 test013-language
--- tests/scripts/test013-language 1 Sep 2002 09:39:08 -0000 1.6
+++ tests/scripts/test013-language 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test014-whoami
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test014-whoami,v
retrieving revision 1.6
diff -u -r1.6 test014-whoami
--- tests/scripts/test014-whoami 5 Dec 2002 17:14:02 -0000 1.6
+++ tests/scripts/test014-whoami 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test015-xsearch
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test015-xsearch,v
retrieving revision 1.7
diff -u -r1.7 test015-xsearch
--- tests/scripts/test015-xsearch 23 Sep 2002 20:27:19 -0000 1.7
+++ tests/scripts/test015-xsearch 26 Mar 2003 10:02:18 -0000
@@ -5,18 +5,8 @@
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
Index: tests/scripts/test016-subref
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/tests/scripts/test016-subref,v
retrieving revision 1.1
diff -u -r1.1 test016-subref
--- tests/scripts/test016-subref 22 Oct 2002 02:11:28 -0000 1.1
+++ tests/scripts/test016-subref 26 Mar 2003 10:02:18 -0000
@@ -6,18 +6,8 @@
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
--- /dev/null 1970-01-01 09:00:00.000000000 +0900
+++ tests/scripts/args.sh 2003-03-26 16:37:07.000000000 +0900
@@ -0,0 +1,20 @@
+
+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