X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2FMakefile.in;h=0b3bf90ad437413acfb66264f42f4c32a7b48b1d;hb=dc4fe01758ba31e4fdc8c2232606e84274b51c5d;hp=7b4e6331093cbb246ce3122310e63e40824b1a5f;hpb=c41226d99737579b9529a3755e73623597c721d8;p=openldap

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 7b4e633109..0b3bf90ad4 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,58 +1,63 @@
-## Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
+# $OpenLDAP$
+## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 ## tests Makefile.in for OpenLDAP
-BUILD_BDB2 = @BUILD_BDB2@
+SUBDIRS= progs
+BUILD_LDBM=@BUILD_LDBM@
+BUILD_BDB=@BUILD_BDB@
 
-SRC      = slapd-tester.c slapd-search.c
-PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel
+test: tests
+tests: ldbm
 
-LDAP_INCDIR= ../include
-LDAP_LIBDIR= ../libraries
-
-XLIBS    = -lldap_r -llber -llutil
-
-build-tools: FORCE
-	$(MAKE) $(MFLAGS) load-tools
-
-load-tools: $(PROGRAMS)
-
-slapd-tester: slapd-tester.o 
-	$(LTLINK) -o $@ slapd-tester.o
-
-slapd-search: slapd-search.o $(LDAP_LIBLBER_DEPEND) $(LDAP_LIBLDAP_DEPEND)
-	$(LTLINK) -o $@ slapd-search.o $(LIBS)
-
-slapd-read: slapd-read.o $(LDAP_LIBLBER_DEPEND) $(LDAP_LIBLDAP_DEPEND)
-	$(LTLINK) -o $@ slapd-read.o $(LIBS)
-
-slapd-addel: slapd-addel.o $(LDAP_LIBLBER_DEPEND) $(LDAP_LIBLDAP_DEPEND)
-	$(LTLINK) -o $@ slapd-addel.o $(LIBS)
+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 ; \
+	else \
+		echo "run configure with --enable-bdb" ; \
+	fi
 
-bdb2-local:	build-tools FORCE
-	@if test "$(BUILD_BDB2)" = "yes" ; then \
-		$(LN_S) $(srcdir)/data . ; \
-		echo "Initiating LDAP tests..." ; \
-		$(MKDIR) test-db test-repl ; \
-		$(srcdir)/scripts/all $(srcdir) bdb2 ; \
+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 ; \
 	else \
-		echo "run configure with --enable-bdb2" ; \
+		echo "run configure with --enable-ldbm" ; \
 	fi
 
-all-local:	build-tools FORCE
+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) $(PROGRAMS)
-	$(RM) *.o
+	-$(RM) -r test-db/[!C]* test-repl/[!C]* *leak *gmon *core
 
 veryclean-local: FORCE
-	@-$(RM) data
-	$(RM) -r test-db test-repl
-	$(RM) $(PROGRAMS)
-	$(RM) *.o
+	@-$(RM) data schema ucdata
+	-$(RM) -r test-db test-repl