X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2FMakefile.in;h=a20ba4542089c8545644b2b9f76d59294276fc28;hb=779d6af56da8facfcaf2a4ad7ed689dc36bd986a;hp=ef60166ac71f3177af0b29d2731f2b74b773babf;hpb=06a895ff2c5badbb0ab554e6f6b644663aa914c8;p=openldap

diff --git a/tests/Makefile.in b/tests/Makefile.in
index ef60166ac7..a20ba45420 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,61 +1,67 @@
-## Copyright 1998 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+# Makefile.in for tests
+# $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## tests Makefile.in for OpenLDAP
+## Copyright 1998-2007 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_BDB2 = @BUILD_BDB2@
-
-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
-
-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
-
-passwd: test-passwd
-test-passwd: FORCE
-	@-$(LN_S) $(srcdir)/data .
-	@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 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
+BUILD_BDB=@BUILD_BDB@
+BUILD_HDB=@BUILD_HDB@
+BUILD_SQL=@BUILD_SQL@
+
+# test primary backends (default)
+test tests:
+	@$(MAKE) bdb
+	@$(MAKE) hdb
+
+# test all backends
+alltests: tests
+	@$(MAKE) sql
+
+bdb test-bdb:	bdb-$(BUILD_BDB)
+bdb-no:
+	@echo "run configure with --enable-bdb to run BDB tests"
+
+bdb-yes bdb-mod: FORCE
+	@echo "Initiating LDAP tests for BDB..."
+	@$(RUN) -b bdb all
+
+hdb test-hdb:	hdb-$(BUILD_HDB)
+hdb-no:
+	@echo "run configure with --enable-hdb to run HDB tests"
+
+hdb-yes hdb-mod: FORCE
+	@echo "Initiating LDAP tests for HDB..."
+	@$(RUN) -b hdb all
+
+sql test-sql:	sql-$(BUILD_SQL)
+sql-no:
+	@echo "run configure with --enable-sql to run SQL tests"
+
+sql-yes sql-mod:	FORCE
+	@echo "Initiating LDAP tests for SQL..."
+	@$(RUN) -b sql sql-all
+
+regressions:	FORCE
+	@echo "Testing (available) ITS regressions"
+	@$(RUN) its-all
+
+its: regressions
 
 clean-local:	FORCE
-	-$(RM) test-db/[!C]* test-repl/[!C]* *gmon *core
+	-$(RM) -r testrun configpw configpw.conf *leak *gmon *core
 
 veryclean-local: FORCE
-	@-$(RM) data
-	$(RM) -r test-db test-repl
+	@-$(RM) run testdata schema ucdata