Rework libldap to not attempt to set LDAP_API_FEATURE_X_OPENLDAP_THREAD_SAFE

[openldap] / tests / Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 70b0433fd2a2d7e8d3f8d362b03ea4ce1261ae56..bbbbc87fefed2ba882884ed7ec9e812a6769ba62 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,29 +1,64 @@
-## Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
+# $OpenLDAP$
+## Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 ## tests Makefile.in for OpenLDAP
-BUILD_BDB2 = @BUILD_BDB2@
-
-bdb2-local:    FORCE
-       @if [ "$(BUILD_BDB2)" = "yes" ]; then \
-               @-$(LN_S) $(srcdir)/data .; \
-               echo "Initiating LDAP tests..."; \
-               $(MKDIR) test-db test-repl ; \
-               $(srcdir)/scripts/all $(srcdir) bdb2;\
+SUBDIRS= progs
+BUILD_LDBM=@BUILD_LDBM@
+BUILD_BDB=@BUILD_BDB@
+BUILD_MONITOR=@BUILD_MONITOR@
+
+test: tests
+tests: bdb ldbm
+
+bdb: test-bdb
+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 \
+               echo "Initiating LDAP tests for BDB..." ; \
+               $(MKDIR) test-db test-repl || true; \
+               $(srcdir)/scripts/all $(srcdir) bdb $(BUILD_MONITOR) ; \
        else \
-               echo "run configure with --enable-bdb2"; \
+               echo "run configure with --enable-bdb" ; \
        fi
 
-all-local:     FORCE
+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)" = "yes" ; then \
+               echo "Initiating LDAP tests for LDBM..." ; \
+               $(MKDIR) test-db test-repl || true; \
+               $(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_MONITOR); \
+       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
+       @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 .
-       @echo "Initiating LDAP tests..."; \
+       @-$(LN_S) $(top_srcdir)/servers/slapd/schema .
+       @-$(LN_S) ../libraries/liblunicode ucdata
+       @echo "Initiating LDAP server with NIS schema & ldbm backend..."; \
        $(MKDIR) test-db test-repl ; \
-       $(srcdir)/scripts/all $(srcdir) ldbm
+       $(srcdir)/scripts/startup_nis_ldap_server.sh $(srcdir) ldbm
 
 clean-local:   FORCE
-       $(RM) test-db/[!C]* test-repl/[!C]* *core
+       -$(RM) -r test-db/[!C]* test-repl/[!C]* *leak *gmon *core
 
 veryclean-local: FORCE
-       @-$(RM) data
-       $(RM) -r test-db test-repl
+       @-$(RM) data schema ucdata
+       -$(RM) -r test-db test-repl