upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-02-18 10:07:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Push invariant args into environment, they were making the "WAIT"

Browse source 
parameter too difficult to use.
This commit is contained in:
Howard Chu 2003-10-10 12:11:22 +00:00
parent 729e38854d
commit 61452ee9c7
3 changed files with 55 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
tests/Makefile.in
View file

@ -10,78 +10,68 @@ BUILD_LDBM=@BUILD_LDBM@
BUILD_MONITOR=@BUILD_MONITOR@
BUILD_CACHE=@BUILD_CACHE@
test: tests
tests: int-bdb
test: tests
tests: ldbm
ldbm: hdb
hdb: bdb
int-bdb: test-bdb
@$(MAKE) int-hdb
int-hdb: test-hdb
@$(MAKE) int-ldbm
int-ldbm: test-ldbm
bdb: test-bdb
test-bdb: FORCE
links: data schema ucdata
data:
@-$(LN_S) $(srcdir)/data .
schema:
@-$(LN_S) $(top_srcdir)/servers/slapd/schema .
ucdata:
@-$(LN_S) ../libraries/liblunicode ucdata
@if test "$(BUILD_BDB)" != "no"; then \
echo "Initiating LDAP tests for BDB..." ; \
$(MKDIR) test-db test-repl || true; \
$(srcdir)/scripts/all $(srcdir) bdb $(BUILD_BDB) $(BUILD_MONITOR) $(BUILD_CACHE) bdb ; \
dirs: test-db test-repl
test-db test-repl:
@$(MKDIR) $@
test-bdb: bdb
bdb: bdb-$(BUILD_BDB)
bdb-no:
@echo "run configure with --enable-bdb"
bdb-yes bdb-mod: links dirs FORCE
@echo "Initiating LDAP tests for BDB..."
@MONITORDB=$(BUILD_MONITOR) PROXYCACHE=$(BUILD_CACHE) BACKENDTYPE=$(BUILD_BDB) $(srcdir)/scripts/all $(srcdir) bdb bdb
test-hdb: hdb
hdb: hdb-$(BUILD_HDB)
hdb-no:
@echo "run configure with --enable-hdb"
hdb-yes hdb-mod: links dirs FORCE
@echo "Initiating LDAP tests for HDB..."
@MONITORDB=$(BUILD_MONITOR) PROXYCACHE=$(BUILD_CACHE) BACKENDTYPE=$(BUILD_HDB) $(srcdir)/scripts/all $(srcdir) hdb hdb
test-ldbm: ldbm
ldbm: ldbm-$(BUILD_LDBM)
ldbm-no:
@echo "run configure with --enable-ldbm"
ldbm-yes ldbm-mod: links dirs FORCE
@echo "Initiating LDAP tests for LDBM..."
@MONITORDB=$(BUILD_MONITOR); PROXYCACHE=$(BUILD_CACHE); \
BACKENDTYPE=$(BUILD_LDBM); export MONITORDB PROXYCACHE BACKENDTYPE; \
if test "$(BUILD_BDB)" != "no"; then \
$(srcdir)/scripts/all $(srcdir) ldbm bdb ; \
else \
echo "run configure with --enable-bdb" ; \
fi
hdb: test-hdb
test-hdb: FORCE
@-$(LN_S) $(srcdir)/data .
@-$(LN_S) $(top_srcdir)/servers/slapd/schema .
@-$(LN_S) ../libraries/liblunicode ucdata
@if test "$(BUILD_HDB)" != "no" ; then \
echo "Initiating LDAP tests for HDB..." ; \
$(MKDIR) test-db test-repl || true; \
$(srcdir)/scripts/all $(srcdir) hdb $(BUILD_HDB) $(BUILD_MONITOR) $(BUILD_CACHE) hdb ; \
else \
echo "run configure with --enable-hdb" ; \
fi
ldbm: test-ldbm
test-ldbm: FORCE
@-$(LN_S) $(srcdir)/data .
@-$(LN_S) $(top_srcdir)/servers/slapd/schema .
@-$(LN_S) ../libraries/liblunicode ucdata
@if test "$(BUILD_LDBM)" != "no" ; then \
echo "Initiating LDAP tests for LDBM..." ; \
$(MKDIR) test-db test-repl || true; \
if test "$(BUILD_BDB)" != "no"; then \
$(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_LDBM) $(BUILD_MONITOR) $(BUILD_CACHE) bdb ; \
if test "$(BUILD_HDB)" != "no"; then \
$(srcdir)/scripts/all $(srcdir) ldbm hdb ; \
else \
if test "$(BUILD_HDB)" != "no"; then \
$(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_LDBM) $(BUILD_MONITOR) $(BUILD_CACHE) hdb ; \
else \
$(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_LDBM) $(BUILD_MONITOR) $(BUILD_CACHE) no ; \
fi ; \
$(srcdir)/scripts/all $(srcdir) ldbm no ; \
fi ; \
else \
echo "run configure with --enable-ldbm" ; \
fi
passwd: test-passwd
test-passwd: FORCE
@-$(LN_S) $(srcdir)/data .
@-$(LN_S) $(top_srcdir)/servers/slapd/schema .
@-$(LN_S) ../libraries/liblunicode ucdata
test-passwd: links dirs FORCE
@echo "Initiating LDAP tests..."
@-$(MKDIR) test-db test-repl || true
@$(srcdir)/scripts/passwd-search $(srcdir) passwd
test-nis-schema: test-nis-schema-ldbm
test-nis-schema-ldbm:
@-$(LN_S) $(srcdir)/data .
@-$(LN_S) $(top_srcdir)/servers/slapd/schema .
@-$(LN_S) ../libraries/liblunicode ucdata
test-nis-schema-ldbm: links dirs FORCE
@echo "Initiating LDAP server with NIS schema & ldbm backend..."; \
$(MKDIR) test-db test-repl ; \
$(srcdir)/scripts/startup_nis_ldap_server.sh $(srcdir) ldbm
clean-local: FORCE

28
tests/scripts/all
View file

@ -22,40 +22,28 @@ fi
echo ">>>>> Backend: $BACKEND"
if test $# -eq 0 ; then
BACKENDTYPE=yes
else
BACKENDTYPE=$1; shift
fi
MONITORDB=${MONITORDB-no}
PROXYCACHE=${PROXYCACHE-no}
BACKENDTYPE=${BACKENDTYPE-yes}
export MONITORDB PROXYCACHE BACKENDTYPE
echo ">>>>> Backend Type: $BACKENDTYPE"
if test $# -eq 0 ; then
MONITOR=no
else
MONITOR=$1; shift
fi
SHTOOL="$SRCDIR/../build/shtool"
if test $# -eq 0 ; then
PROXYCACHE=no
else
PROXYCACHE=$1; shift
fi
if test $# -eq 0 ; then
SYNCREPL=no
else
SYNCREPL=$1; shift
fi
SHTOOL="$SRCDIR/../build/shtool"
TB=`$SHTOOL echo -e "%B"`
TN=`$SHTOOL echo -e "%b"`
for CMD in $SRCDIR/scripts/test*; do
echo ">>>>> Starting ${TB}`basename $CMD`${TN} ..."
$CMD $SRCDIR $BACKEND $BACKENDTYPE $MONITOR $PROXYCACHE $SYNCREPL
$CMD $SRCDIR $BACKEND $SYNCREPL
RC=$?
if test $RC -eq 0 ; then
echo ">>>>> $CMD completed ${TB}OK${TN}."

15
tests/scripts/args.sh
View file

@ -5,21 +5,6 @@ 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
PROXYCACHE=no
if test $# -ge 1 ; then
PROXYCACHE=$1; shift
fi
SYNCREPL=no
if test $# -ge 1 ; then
SYNCREPL=$1; shift