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

diff --git a/tests/Makefile.in b/tests/Makefile.in
index d469c700eb..0b3bf90ad4 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,36 +1,46 @@
 # $OpenLDAP$
-## Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
+## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 ## tests Makefile.in for OpenLDAP
 SUBDIRS= progs
-
-BUILD_BDB2 = @BUILD_BDB2@
+BUILD_LDBM=@BUILD_LDBM@
+BUILD_BDB=@BUILD_BDB@
 
 test: tests
-tests: bdb2 ldbm
+tests: ldbm
 
-bdb2: test-bdb2
-test-bdb2:	FORCE
-	@-$(LN_S) $(srcdir)/data . 
-	@if test "$(BUILD_BDB2)" = "yes" ; then \
-		echo "Initiating LDAP tests..." ; \
+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) bdb2 ; \
+		$(srcdir)/scripts/all $(srcdir) bdb ; \
 	else \
-		echo "run configure with --enable-bdb2" ; \
+		echo "run configure with --enable-bdb" ; \
 	fi
 
 ldbm: test-ldbm
 test-ldbm:	FORCE
 	@-$(LN_S) $(srcdir)/data .
-	@echo "Initiating LDAP tests..."
-	@-$(MKDIR) test-db test-repl || true
-	@$(srcdir)/scripts/all $(srcdir) ldbm
+	@-$(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-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
@@ -38,25 +48,16 @@ test-passwd: FORCE
 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
 	@echo "Initiating LDAP server with NIS schema & ldbm backend..."; \
 	$(MKDIR) test-db test-repl ; \
 	$(srcdir)/scripts/startup_nis_ldap_server.sh $(srcdir) ldbm
 
-test-nis-schema-bdb2:
-	@-$(LN_S) $(srcdir)/data .
-	@echo "Initiating LDAP server with NIS schema & DB2 backend..."; \
-	@if test "$(BUILD_BDB2)" = "yes" ; then \
-		echo "Initiating LDAP tests..." ; \
-		$(MKDIR) test-db test-repl ; \
-		$(srcdir)/scripts/startup_nis_ldap_server.sh $(srcdir) bdb2 ; \
-	else \
-		echo "run configure with --enable-bdb2" ; \
-	fi
-
 clean-local:	FORCE
-	-$(RM) test-db/[!C]* test-repl/[!C]* *leak *gmon *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