X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2FMakefile.in;h=a20ba4542089c8545644b2b9f76d59294276fc28;hb=9f3f281df0d733b6a8ec90a76cc9c79096631b98;hp=3184786344c92f0506fb447a67e9908e38cb69e1;hpb=e6006f90578223df37c65fc90b62e9a7a719df08;p=openldap

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 3184786344..a20ba45420 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,93 +1,67 @@
+# 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-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_BDB=@BUILD_BDB@
 BUILD_HDB=@BUILD_HDB@
-BUILD_LDBM=@BUILD_LDBM@
-BUILD_MONITOR=@BUILD_MONITOR@
-BUILD_CACHE=@BUILD_CACHE@
+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"
 
-test: tests
-tests: int-bdb
+bdb-yes bdb-mod: FORCE
+	@echo "Initiating LDAP tests for BDB..."
+	@$(RUN) -b bdb all
 
-int-bdb: test-bdb
-	@$(MAKE) int-hdb
-int-hdb: test-hdb
-	@$(MAKE) int-ldbm
-int-ldbm: test-ldbm
+hdb test-hdb:	hdb-$(BUILD_HDB)
+hdb-no:
+	@echo "run configure with --enable-hdb to run HDB 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)" != "no"; then \
-		echo "Initiating LDAP tests for BDB..." ; \
-		$(MKDIR) test-db test-repl || true; \
-		$(srcdir)/scripts/all $(srcdir) bdb $(BUILD_BDB) $(BUILD_MONITOR) $(BUILD_CACHE) bdb ; \
-	else \
-		echo "run configure with --enable-bdb" ; \
-	fi
+hdb-yes hdb-mod: FORCE
+	@echo "Initiating LDAP tests for HDB..."
+	@$(RUN) -b hdb 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) $(BUILD_CACHE) hdb ; \
-	else \
-		echo "run configure with --enable-hdb" ; \
-	fi
+sql test-sql:	sql-$(BUILD_SQL)
+sql-no:
+	@echo "run configure with --enable-sql to run SQL tests"
 
-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; \
-		if test "$(BUILD_BDB)" != "no"; then \
-			$(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_LDBM) $(BUILD_MONITOR) $(BUILD_CACHE) bdb ; \
-		else \
-			if test "$(BUILD_HDB)" != "no"; then \
-				$(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_LDBM) $(BUILD_MONITOR) $(BUILD_CACHE) hdb ; \
-			else \
-				$(srcdir)/scripts/all $(srcdir) ldbm $(BUILD_LDBM) $(BUILD_MONITOR) $(BUILD_CACHE) no ; \
-			fi ; \
-		fi ; \
-	else \
-		echo "run configure with --enable-ldbm" ; \
-	fi
+sql-yes sql-mod:	FORCE
+	@echo "Initiating LDAP tests for SQL..."
+	@$(RUN) -b sql sql-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
+regressions:	FORCE
+	@echo "Testing (available) ITS regressions"
+	@$(RUN) its-all
 
-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
+its: regressions
 
 clean-local:	FORCE
-	-$(RM) -r test-db/[!C]* test-repl/[!C]* test-cache/[!C]* *leak *gmon *core
+	-$(RM) -r testrun configpw configpw.conf *leak *gmon *core
 
 veryclean-local: FORCE
-	@-$(RM) data schema ucdata
-	-$(RM) -r test-db test-repl test-cache
+	@-$(RM) run testdata schema ucdata