Don't diff against /dev/null, use empty stdin instead.

[openldap] / tests / Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 4a66102e7d41d348de1119610cb62620c50c78e9..5d250a2d5aad0418070f10798b7894c7d66ca61d 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,35 +1,30 @@
-## 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
 SUBDIRS= progs
-
-BUILD_BDB2 = @BUILD_BDB2@
+BUILD_LDBM=@BUILD_LDBM@
 
 test: tests
-tests: bdb2 ldbm
-
-bdb2: test-bdb2
-test-bdb2:     FORCE
-       @-$(LN_S) $(srcdir)/data . 
-       @if test "$(BUILD_BDB2)" = "yes" ; then \
-               echo "Initiating LDAP tests..." ; \
-               $(MKDIR) test-db test-repl || true; \
-               $(srcdir)/scripts/all $(srcdir) bdb2 ; \
-       else \
-               echo "run configure with --enable-bdb2" ; \
-       fi
+tests: ldbm
 
 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 .
+       @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 .
        @echo "Initiating LDAP tests..."
        @-$(MKDIR) test-db test-repl || true
        @$(srcdir)/scripts/passwd-search $(srcdir) passwd
@@ -37,25 +32,15 @@ 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 .
        @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
+       -$(RM) -r test-db test-repl