more on fixing escaped semicolon in normalized DN

[openldap] / tests / Makefile.in

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 99654ecd5d60f3c90bca4cd6a57ad7a045258b44..642f39446595637a14eb5a9853e8557c2ebebc2c 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,84 +1,57 @@
+# Makefile.in for tests
 # $OpenLDAP$
-## Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## tests Makefile.in for OpenLDAP
+## Copyright 1998-2004 The OpenLDAP Foundation.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+
+RUN=./run
 SUBDIRS= progs
+
 BUILD_BDB=@BUILD_BDB@
 BUILD_HDB=@BUILD_HDB@
 BUILD_LDBM=@BUILD_LDBM@
-BUILD_MONITOR=@BUILD_MONITOR@
 
-test: tests
-tests: int-bdb
+test tests:
+       @$(MAKE) bdb
+       @$(MAKE) hdb
+       @$(MAKE) ldbm
 
-int-bdb: test-bdb
-       @$(MAKE) int-hdb
-int-hdb: test-hdb
-       @$(MAKE) int-ldbm
-int-ldbm: test-ldbm
+bdb test-bdb:  bdb-$(BUILD_BDB)
+bdb-no:
+       @echo "run configure with --enable-bdb"
 
-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)" != "no"; then \
-               echo "Initiating LDAP tests for BDB..." ; \
-               $(MKDIR) test-db test-repl || true; \
-               $(srcdir)/scripts/all $(srcdir) bdb $(BUILD_BDB) $(BUILD_MONITOR) ; \
-       else \
-               echo "run configure with --enable-bdb" ; \
-       fi
+bdb-yes bdb-mod: FORCE
+       @echo "Initiating LDAP tests for BDB..."
+       @$(RUN) -b bdb all
 
-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) ; \
-       else \
-               echo "run configure with --enable-hdb" ; \
-       fi
+hdb test-hdb:  hdb-$(BUILD_HDB)
+hdb-no:
+       @echo "run configure with --enable-hdb"
 
-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; \
-               $(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_LDBM) $(BUILD_MONITOR); \
-       else \
-               echo "run configure with --enable-ldbm" ; \
-       fi
+hdb-yes hdb-mod: FORCE
+       @echo "Initiating LDAP tests for HDB..."
+       @$(RUN) -b hdb all
 
-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
+ldbm test-ldbm:        ldbm-$(BUILD_LDBM)
+ldbm-no:
+       @echo "run configure with --enable-ldbm"
 
-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
+ldbm-yes ldbm-mod:     FORCE
+       @echo "Initiating LDAP tests for LDBM..."
+       @$(RUN) -b ldbm all
 
 clean-local:   FORCE
-       -$(RM) -r test-db/[!C]* test-repl/[!C]* test-cache/[!C]* *leak *gmon *core
+       -$(RM) -r testrun *leak *gmon *core
 
 veryclean-local: FORCE
        @-$(RM) data schema ucdata
-       -$(RM) -r test-db test-repl test-cache