X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2FMakefile.in;h=267422ca6843ce3959f1833f41d14db8fe85fa2a;hb=787e53e6a4e4fefb0cbaae89ef0a3acb138f24f4;hp=9bf6b1965918bdafd3c688ff81cb98f4f987467b;hpb=3fbe93c704f5bc9914d8d0ffb3bba0a5ae6eb52b;p=openldap

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9bf6b19659..267422ca68 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,81 +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-2009 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@
-WITH_TLS=@WITH_TLS@
+BUILD_SQL=@BUILD_SQL@
 
+# test primary backends (default)
 test tests:
 	@$(MAKE) bdb
 	@$(MAKE) hdb
-	@$(MAKE) ldbm
-
-links:	data schema ucdata
-data:
-	@-$(LN_S) $(srcdir)/data .
-schema:
-	@-$(LN_S) $(top_srcdir)/servers/slapd/schema .
-ucdata:
-	@-$(LN_S) ../libraries/liblunicode ucdata
 
-dirs:	test-db test-repl
-test-db test-repl:
-	@$(MKDIR) $@
+# test all backends
+alltests: tests
+	@$(MAKE) sql
 
 bdb test-bdb:	bdb-$(BUILD_BDB)
 bdb-no:
-	@echo "run configure with --enable-bdb"
+	@echo "run configure with --enable-bdb to run BDB tests"
 
-bdb-yes bdb-mod:	links dirs FORCE
+bdb-yes bdb-mod: FORCE
 	@echo "Initiating LDAP tests for BDB..."
-	@MONITORDB=$(BUILD_MONITOR) PROXYCACHE=$(BUILD_CACHE) WITHTLS=$(WITH_TLS) BACKENDTYPE=$(BUILD_BDB) $(srcdir)/scripts/all $(srcdir) bdb bdb
+	@$(RUN) -b bdb all
 
 hdb test-hdb:	hdb-$(BUILD_HDB)
 hdb-no:
-	@echo "run configure with --enable-hdb"
+	@echo "run configure with --enable-hdb to run HDB tests"
 
-hdb-yes hdb-mod:	links dirs FORCE
+hdb-yes hdb-mod: FORCE
 	@echo "Initiating LDAP tests for HDB..."
-	@MONITORDB=$(BUILD_MONITOR) PROXYCACHE=$(BUILD_CACHE) WITHTLS=$(WITH_TLS) BACKENDTYPE=$(BUILD_HDB) $(srcdir)/scripts/all $(srcdir) hdb hdb
+	@$(RUN) -b hdb all
 
-ldbm test-ldbm:	ldbm-$(BUILD_LDBM)
-ldbm-no:
-	@echo "run configure with --enable-ldbm"
+sql test-sql:	sql-$(BUILD_SQL)
+sql-no:
+	@echo "run configure with --enable-sql to run SQL tests"
 
-ldbm-yes ldbm-mod:	links dirs FORCE
-	@echo "Initiating LDAP tests for LDBM..."
-	@MONITORDB=$(BUILD_MONITOR); PROXYCACHE=$(BUILD_CACHE); WITHTLS=$(WITH_TLS) \
-	BACKENDTYPE=$(BUILD_LDBM); \
-	export MONITORDB PROXYCACHE WITHTLS  BACKENDTYPE; \
-	if test "$(BUILD_BDB)" != "no"; then \
-			$(srcdir)/scripts/all $(srcdir) ldbm bdb ; \
-	else \
-		if test "$(BUILD_HDB)" != "no"; then \
-				$(srcdir)/scripts/all $(srcdir) ldbm hdb ; \
-		else \
-				$(srcdir)/scripts/all $(srcdir) ldbm no ; \
-		fi ; \
-	fi
+sql-yes sql-mod:	FORCE
+	@echo "Initiating LDAP tests for SQL..."
+	@$(RUN) -b sql sql-all
 
-passwd test-passwd:	links dirs FORCE
-	@echo "Initiating LDAP tests..."
-	@$(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:	links dirs FORCE
-	@echo "Initiating LDAP server with NIS schema & ldbm backend..."; \
-	$(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